projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Return CURL error message when object transfer fails
[git.git]
/
git-merge.sh
diff --git
a/git-merge.sh
b/git-merge.sh
index
413bfca
..
7607e81
100755
(executable)
--- a/
git-merge.sh
+++ b/
git-merge.sh
@@
-19,7
+19,7
@@
default_strategies='resolve octopus'
use_strategies=
dropsave() {
use_strategies=
dropsave() {
- rm -f -- "$GIT_DIR/MERGE_HEAD" \
+ rm -f -- "$GIT_DIR/MERGE_HEAD"
"$GIT_DIR/MERGE_MSG"
\
"$GIT_DIR/MERGE_SAVE" || exit 1
}
"$GIT_DIR/MERGE_SAVE" || exit 1
}
@@
-28,9
+28,12
@@
savestate() {
}
restorestate() {
}
restorestate() {
- git reset --hard $head
- cpio -iuv <"$GIT_DIR/MERGE_SAVE"
- git-update-index --refresh >/dev/null
+ if test -f "$GIT_DIR/MERGE_SAVE"
+ then
+ git reset --hard $head
+ cpio -iuv <"$GIT_DIR/MERGE_SAVE"
+ git-update-index --refresh >/dev/null
+ fi
}
summary() {
}
summary() {
@@
-160,6
+163,7
@@
case "$use_strategies" in
single_strategy=no
;;
*)
single_strategy=no
;;
*)
+ rm -f "$GIT_DIR/MERGE_SAVE"
single_strategy=yes
;;
esac
single_strategy=yes
;;
esac
@@
-242,4
+246,6
@@
for remote
do
echo $remote
done >"$GIT_DIR/MERGE_HEAD"
do
echo $remote
done >"$GIT_DIR/MERGE_HEAD"
+echo $merge_msg >"$GIT_DIR/MERGE_MSG"
+
die "Automatic merge failed; fix up by hand"
die "Automatic merge failed; fix up by hand"