projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Anal retentive 'const unsigned char *sha1'
[git.git]
/
git-resolve-script
diff --git
a/git-resolve-script
b/git-resolve-script
index
186b234
..
da79a97
100644
(file)
--- a/
git-resolve-script
+++ b/
git-resolve-script
@@
-36,9
+36,6
@@
if [ "$common" == "$merge" ]; then
fi
if [ "$common" == "$head" ]; then
echo "Updating from $head to $merge."
fi
if [ "$common" == "$head" ]; then
echo "Updating from $head to $merge."
- echo "Destroying all noncommitted data!"
- echo "Kill me within 3 seconds.."
- sleep 3
git-read-tree -u -m $head $merge || exit 1
echo $merge > "$GIT_DIR"/HEAD
git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat
git-read-tree -u -m $head $merge || exit 1
echo $merge > "$GIT_DIR"/HEAD
git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat
@@
-46,12
+43,15
@@
if [ "$common" == "$head" ]; then
fi
echo "Trying to merge $merge into $head"
git-read-tree -u -m $common $head $merge || exit 1
fi
echo "Trying to merge $merge into $head"
git-read-tree -u -m $common $head $merge || exit 1
-merge_msg="Merge
of
$merge_repo"
+merge_msg="Merge $merge_repo"
result_tree=$(git-write-tree 2> /dev/null)
if [ $? -ne 0 ]; then
echo "Simple merge failed, trying Automatic merge"
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
- merge_msg="Automatic merge of $merge_repo"
+ 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
result_tree=$(git-write-tree) || exit 1
fi
result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
result_tree=$(git-write-tree) || exit 1
fi
result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)