Abort if --rejoin fails.
Thanks to Eduardo Kienetz for noticing this.
Avery Pennarun committed
Apr 30, 2009 at 21:57 UTC
ea28d674423aa580bfdbe24991ffcf796f2dd3dc
1 file changed
+1
-1
git-subtree.sh
+1
-1
@@ -406,7 +406,7 @@ cmd_split()
406
latest_old=$(cache_get latest_old)
407
git merge -s ours \
408
-m "$(merge_msg $dir $latest_old $latest_new)" \
409
- $latest_new >&2
409
+ $latest_new >&2 || exit $?
410
fi
411
echo $latest_new
412
exit 0