From 4e015a2e8ec5c3d8e3d6b266f883ea72b7011896 Mon Sep 17 00:00:00 2001
From: Dridi Boukelmoune <dridi.boukelmoune@gmail.com>
Date: Fri, 24 Oct 2014 11:09:22 +0200
Subject: [PATCH] vcsh: Fail fast if the clone branch is not valid
Also fixed the last hardcoded reference to the master branch.
---
vcsh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/vcsh b/vcsh
index 76502f5..200cab2 100755
--- a/vcsh
+++ b/vcsh
@@ -147,16 +147,16 @@ clone() {
hook pre-clone
init
git remote add origin "$GIT_REMOTE"
+ git checkout -b "$VCSH_BRANCH" || return $?
git config branch."$VCSH_BRANCH".remote origin
git config branch."$VCSH_BRANCH".merge refs/heads/"$VCSH_BRANCH"
- git checkout -b $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
git fetch origin "$VCSH_BRANCH"
hook pre-merge
- git ls-tree -r --name-only origin/master | (while read object; do
+ git ls-tree -r --name-only origin/"$VCSH_BRANCH" | (while read object; do
[ -e "$object" ] &&
error "'$object' exists." &&
VCSH_CONFLICT=1
--
GitLab