Andrew's git / gitweb.git / diff
?
Abort if --rejoin fails.
authorAvery Pennarun <apenwarr@gmail.com>
Fri, 1 May 2009 01:57:32 +0000 (21:57 -0400)
committerAvery Pennarun <apenwarr@gmail.com>
Fri, 1 May 2009 01:57:32 +0000 (21:57 -0400)
Thanks to Eduardo Kienetz for noticing this.

git-subtree.sh patch | blob | history
diff --git a/git-subtree.sh b/git-subtree.sh
index 39c377c173ac3e74006a2cfa2095f3692b557c9a..692792b864a81fedc6329e54b710033e81799c2c 100755 (executable)
--- a/git-subtree.sh
+++ b/git-subtree.sh
@@ -406,7 +406,7 @@ cmd_split()
                latest_old=$(cache_get latest_old)
                git merge -s ours \
                        -m "$(merge_msg $dir $latest_old $latest_new)" \
-                       $latest_new >&2
+                       $latest_new >&2 || exit $?
        fi
        echo $latest_new
        exit 0