undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/subtree-do-not-push-if-split-fails'

Browse Source 
"git subtree" (in contrib/) had one codepath with loose error
checks to lose data at the remote side.

* jk/subtree-do-not-push-if-split-fails:
  contrib/subtree: don't delete remote branches if split fails
This commit is contained in:
Junio C Hamano 2013-05-29 14:29:53 -07:00
commit feffa04437
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/subtree/git-subtree.sh
View File

@ -715,7 +715,8 @@ cmd_push()
repository=$1 repository=$1
refspec=$2 refspec=$2
echo "git push using: " $repository $refspec echo "git push using: " $repository $refspec
git push $repository $(git subtree split --prefix=$prefix):refs/heads/$refspec localrev=$(git subtree split --prefix="$prefix") || die
git push $repository $localrev:refs/heads/$refspec
else else
die "'$dir' must already exist. Try 'git subtree add'." die "'$dir' must already exist. Try 'git subtree add'."
fi fi