diff options
| author |  Avery Pennarun <apenwarr@gmail.com> | 2009-04-30 21:57:32 -0400 |
|---|---|---|
| committer | Avery Pennarun <apenwarr@gmail.com> | 2009-04-30 21:57:32 -0400 |
| commit | ea28d674423aa580bfdbe24991ffcf796f2dd3dc (patch) | |
| tree | 49e8701748598fa5681ba29b1e0cc65734e974a8 | |
| parent | debug messages are off by default; use -d to enable. (diff) | |
| download | tgif-ea28d674423aa580bfdbe24991ffcf796f2dd3dc.tar.xz | |
Abort if --rejoin fails.
Thanks to Eduardo Kienetz for noticing this.
| -rwxr-xr-x | git-subtree.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-subtree.sh b/git-subtree.sh index 39c377c173..692792b864 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 |