diff options
| author |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-19 19:42:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-19 19:42:21 -0700 |
| commit | 55a716cc8c93fd2eb161ae17f316ee01e8061be6 (patch) | |
| tree | cf4134d676441b019a7bc3c3899c268c77cbce79 /git-resolve-script | |
| parent | [PATCH] cvs2git.c: support incremental conversion (diff) | |
| download | tgif-55a716cc8c93fd2eb161ae17f316ee01e8061be6.tar.xz | |
Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges.
Otherwise you'll be bitten by a stale MERGE_HEAD like Jeff was..
Diffstat (limited to 'git-resolve-script')
| -rwxr-xr-x | git-resolve-script | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-resolve-script b/git-resolve-script index 0b04a5f6af..007e29a2ed 100755 --- a/git-resolve-script +++ b/git-resolve-script @@ -32,6 +32,7 @@ fi if [ "$common" == "$merge" ]; then echo "Already up-to-date. Yeeah!" + rm -f -- "$GIT_DIR/ORIG_HEAD" "$GIT_DIR/MERGE_HEAD" exit 0 fi if [ "$common" == "$head" ]; then @@ -39,6 +40,7 @@ if [ "$common" == "$head" ]; then git-read-tree -u -m $head $merge || exit 1 echo $merge > "$GIT_DIR"/HEAD git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat + rm -f -- "$GIT_DIR/ORIG_HEAD" "$GIT_DIR/MERGE_HEAD" exit 0 fi echo "Trying to merge $merge into $head" @@ -58,4 +60,4 @@ result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $me echo "Committed merge $result_commit" echo $result_commit > "$GIT_DIR"/HEAD git-diff-tree -p $head $result_commit | git-apply --stat -rm $GIT_DIR/ORIG_HEAD $GIT_DIR/MERGE_HEAD +rm -f -- "$GIT_DIR/ORIG_HEAD" "$GIT_DIR/MERGE_HEAD" |