Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vcsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Kevin Lyda
vcsh
Commits
a171b8ba
Commit
a171b8ba
authored
11 years ago
by
Richard Hartmann
Committed by
Dridi Boukelmoune
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
vcsh: Proper quoting for "$VCSH_BRANCH"
parent
8f53cfb0
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
vcsh
+3
-3
3 additions, 3 deletions
vcsh
with
3 additions
and
3 deletions
vcsh
+
3
−
3
View file @
a171b8ba
...
...
@@ -147,8 +147,8 @@ clone() {
init
git remote add origin
"
$GIT_REMOTE
"
git config branch.
"
$VCSH_BRANCH
"
.remote origin
git config branch.
"
$VCSH_BRANCH
"
.merge refs/heads/
$VCSH_BRANCH
if
[
$(
git ls-remote origin
$VCSH_BRANCH
2> /dev/null |
wc
-l
)
-lt
1
]
;
then
git config branch.
"
$VCSH_BRANCH
"
.merge refs/heads/
"
$VCSH_BRANCH
"
if
[
$(
git ls-remote origin
"
$VCSH_BRANCH
"
2> /dev/null |
wc
-l
)
-lt
1
]
;
then
info
"remote is empty, not merging anything"
exit
fi
...
...
@@ -162,7 +162,7 @@ clone() {
[
x
"
$VCSH_CONFLICT
"
=
x
'1'
])
&&
fatal
"will stop after fetching and not try to merge!
Once this situation has been resolved, run 'vcsh
$VCSH_REPO_NAME
pull' to finish cloning."
17
git merge origin/
master
# XXX
git merge origin/
"
$VCSH_BRANCH
"
hook post-merge
hook post-clone
retire
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment