mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-resolve-script: stop when the automated merge fails

Browse Source 
No point in doing a tree write that will just throw
confusing messages on the screen.
This commit is contained in:
Linus Torvalds
2005-06-06 19:37:25 -07:00
parent ed37b5b2b9
commit e5b905c448
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git-resolve-script
View File

@ -47,7 +47,11 @@ merge_msg="Merge of $merge_repo"
result_tree=$(git-write-tree 2> /dev/null) result_tree=$(git-write-tree 2> /dev/null)
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Simple merge failed, trying Automatic merge" 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" merge_msg="Automatic merge of $merge_repo"
result_tree=$(git-write-tree) || exit 1 result_tree=$(git-write-tree) || exit 1
fi fi