diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-05 06:44:40 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-06 21:47:14 +0300 |
| commit | 49ed2bc4660c7cd0592cf21cc514080574d06320 (patch) | |
| tree | 47b638a26e9fff92892bf0d44740e9ef139297c6 | |
| parent | 0fb1eaa8850557249a8d1c43a4f0f3ac5a5f75ce (diff) | |
git-reset to remove "$GIT_DIR/MERGE_MSG"v1.4.4.2
An earlier commit a9cb3c6e changed git-commit to use the
contents of MERGE_MSG even when we do not have MERGE_HEAD (the
rationale is in its log message).
However, the change tricks the following sequence to include a
merge message in a completely unrelated commit:
$ git pull somewhere
: oops, the conflicts are too much. forget it.
$ git reset --hard
: work work work
$ git commit
To fix this confusion, this patch makes "git reset" to remove
the leftover MERGE_MSG that was prepared when the user abandoned
the merge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Acked-by: Luben Tuikov <ltuikov@yahoo.com
| -rwxr-xr-x | git-reset.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-reset.sh b/git-reset.sh index 3133b5bd25..c0feb4435d 100755 --- a/git-reset.sh +++ b/git-reset.sh @@ -63,6 +63,7 @@ case "$reset_type" in ;; esac -rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" "$GIT_DIR/SQUASH_MSG" +rm -f "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/rr-cache/MERGE_RR" \ + "$GIT_DIR/SQUASH_MSG" "$GIT_DIR/MERGE_MSG" exit $update_ref_status |