Skip to content
Snippets Groups Projects
Commit eb672cdb authored by Richard Hartmann's avatar Richard Hartmann
Browse files

Improve error message for aborted clone

parent 91a17725
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
vcsh
+ 1
− 0
View file @ eb672cdb
...@@ -144,6 +144,7 @@ elif [ "$1" = 'clone' ]; then ...@@ -144,6 +144,7 @@ elif [ "$1" = 'clone' ]; then
done done
[ "$VCSH_CONFLICT" = '1' ] && [ "$VCSH_CONFLICT" = '1' ] &&
echo "$SELF: fatal: will stop after fetching and not try to merge!\n" && echo "$SELF: fatal: will stop after fetching and not try to merge!\n" &&
echo " Once this situation has been resolved, run 'vcsh run <foo> git pull' to finish cloning.\n" &&
exit 3 exit 3
git merge origin/master git merge origin/master
# vcsh use $REPO_NAME # vcsh use $REPO_NAME
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment