--- Junio C Hamano <junkio@xxxxxxx> wrote:
> 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@xxxxxxx>
Acked-by: Luben Tuikov <ltuikov@xxxxxxxxx
>
> ---
>
> * Marked as RFC because I suspect I am missing a valid use case
> where a user might want to say "reset" as part of continuing
> the conflicted merge resolution, although I do not think of
> any offhand...
I also cannot think of any offhand. Should be safe to commit.
Luben
>
> git-reset.sh | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/git-reset.sh b/git-reset.sh
> index 3133b5b..c0feb44 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
>
>
>
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html