From: Avery Pennarun <apenwarr@gmail.com>
Date: Fri, 1 May 2009 01:57:32 +0000 (-0400)
Subject: Abort if --rejoin fails.
X-Git-Tag: v1.7.11-rc0~176^2~62
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ea28d674423aa580bfdbe24991ffcf796f2dd3dc;p=git.git

Abort if --rejoin fails.

Thanks to Eduardo Kienetz for noticing this.
---

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