From ea28d674423aa580bfdbe24991ffcf796f2dd3dc Mon Sep 17 00:00:00 2001 From: Avery Pennarun Date: Thu, 30 Apr 2009 21:57:32 -0400 Subject: [PATCH] Abort if --rejoin fails. Thanks to Eduardo Kienetz for noticing this. --- git-subtree.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-subtree.sh b/git-subtree.sh index 39c377c17..692792b86 100755 --- 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 -- 2.26.2