Abort if --rejoin fails.

Thanks to Eduardo Kienetz for noticing this.
2009-04-30 21:57:32 -04:00 · 2009-04-30 21:57:32 -04:00 · ea28d67442
commit ea28d67442
parent 942dce5578
1 changed files with 1 additions and 1 deletions
--- 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