diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-05-29 14:29:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-29 14:29:53 -0700 |
| commit | feffa044374c4bfc29b3f2b1bd26551acbffcf40 (patch) | |
| tree | 19550899503357f02a147c2699c3126a271f2bb0 /contrib | |
| parent | Merge branch 'jk/test-output' (diff) | |
| parent | contrib/subtree: don't delete remote branches if split fails (diff) | |
| download | tgif-feffa044374c4bfc29b3f2b1bd26551acbffcf40.tar.xz | |
Merge branch 'jk/subtree-do-not-push-if-split-fails'
"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
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/subtree/git-subtree.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index 8a23f58ba0..10daa8b0eb 100755 --- a/contrib/subtree/git-subtree.sh +++ b/contrib/subtree/git-subtree.sh @@ -715,7 +715,8 @@ cmd_push() repository=$1 refspec=$2 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 die "'$dir' must already exist. Try 'git subtree add'." fi |