[PATCH v2 09/23] contrib/subtree: Teach push to abort if split fails
From: Paul Campbell <hidden>
Date: 2016-06-15 22:56:21
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Michael Hart <redacted> Added a check to ensure that split succeeds before trying to push. Signed-off-by: Paul Campbell <redacted> --- contrib/subtree/git-subtree.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 8056851..ae9f87f 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh@@ -754,7 +754,12 @@ cmd_push() refspec=$(git config -f .gittrees subtree.$prefix.branch) fi echo "git push using: " $repository $refspec - git push $repository $(git subtree split --prefix=$prefix):refs/heads/$refspec + rev=$(git subtree split --prefix=$prefix) + if [ -n "$rev" ]; then + git push $repository $rev:refs/heads/$refspec + else + die "Couldn't push, 'git subtree split' failed." + fi else die "'$dir' must already exist. Try 'git subtree add'." fi
--
1.8.2.rc1