diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-06 19:37:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-06 19:37:25 -0700 |
| commit | e5b905c4481a3364070094b8ce0c2bf7fa5d481e (patch) | |
| tree | 46b5c93213487c8d06759333b0669d0f8e0fb04d /git-resolve-script | |
| parent | ed37b5b2b94398f3ab8312dfdf23cfd25549e3ec (diff) | |
| download | git-e5b905c4481a3364070094b8ce0c2bf7fa5d481e.tar.gz git-e5b905c4481a3364070094b8ce0c2bf7fa5d481e.tar.xz | |
git-resolve-script: stop when the automated merge fails
No point in doing a tree write that will just throw
confusing messages on the screen.
Diffstat (limited to 'git-resolve-script')
| -rw-r--r-- | git-resolve-script | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/git-resolve-script b/git-resolve-script index 74fb2875b..cd6e25a8a 100644 --- a/git-resolve-script +++ b/git-resolve-script @@ -47,7 +47,11 @@ merge_msg="Merge of $merge_repo" result_tree=$(git-write-tree 2> /dev/null) if [ $? -ne 0 ]; then echo "Simple merge failed, trying Automatic merge" - git-merge-cache git-merge-one-file-script -a + git-merge-cache -o git-merge-one-file-script -a + if [ $? -ne 0 ]; then + echo "Automatic merge failed, fix up by hand" + exit 1 + fi merge_msg="Automatic merge of $merge_repo" result_tree=$(git-write-tree) || exit 1 fi |