Michael J Gruber 9d89b35526 merge: save merge state earlier ...

If the `git merge` process is killed while waiting for the editor to
finish, the merge state is lost but the prepared merge msg and tree is kept.
So, a subsequent `git commit` creates a squashed merge even when the
user asked for proper merge commit originally.

Demonstrate the problem with a test crafted after the in t7502. The test
requires EXECKEEPSPID (thus does not run under MINGW).

Save the merge state earlier (in the non-squash case) so that it does
not get lost. This makes the test pass.

Reported-by: hIpPy <hippy2981@gmail.com>
Signed-off-by: Michael J Gruber <git@grubix.eu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2017-08-23 10:35:02 -07:00

..

add.c

Merge branch 'jk/warn-add-gitlink'

2017-06-24 14:28:41 -07:00

am.c

Merge branch 'ab/free-and-null'

2017-06-24 14:28:41 -07:00

annotate.c

…

apply.c

Convert read_mmblob to take struct object_id.

2016-09-07 12:59:42 -07:00

archive.c

archive: read local configuration

2016-11-22 13:55:20 -08:00

bisect--helper.c

…

blame.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

branch.c

Merge branch 'kn/ref-filter-branch-list'

2017-07-12 15:18:23 -07:00

bundle.c

bundle: use prefix_filename with bundle path

2017-03-21 11:18:41 -07:00

cat-file.c

Merge branch 'jt/unify-object-info'

2017-07-05 13:32:57 -07:00

check-attr.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

check-ignore.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

check-mailmap.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

check-ref-format.c

…

checkout-index.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

checkout.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

clean.c

Merge branch 'ab/free-and-null'

2017-06-24 14:28:41 -07:00

clone.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

column.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

commit-tree.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

commit.c

Merge branch 'ks/typofix-commit-c-comment'

2017-07-10 13:42:51 -07:00

config.c

Merge branch 'ab/free-and-null'

2017-06-24 14:28:41 -07:00

count-objects.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

credential.c

credential: handle invalid arguments earlier

2017-05-30 14:45:03 +09:00

describe.c

Merge branch 'sb/hashmap-customize-comparison'

2017-07-13 16:14:54 -07:00

diff-files.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

diff-index.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

diff-tree.c

Merge branch 'jc/diff-tree-stale-comment' into maint

2017-06-24 15:29:31 -07:00

diff.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

difftool.c

hashmap.h: compare function has access to a data field

2017-06-30 12:49:28 -07:00

fast-export.c

hashmap.h: compare function has access to a data field

2017-06-30 12:49:28 -07:00

fetch-pack.c

Rename sha1_array to oid_array

2017-03-31 08:33:56 -07:00

fetch.c

Merge branch 'sb/pull-rebase-submodule'

2017-07-13 16:14:54 -07:00

fmt-merge-msg.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

for-each-ref.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

fsck.c

Merge branch 'rs/sha1-name-readdir-optim'

2017-07-05 13:32:56 -07:00

gc.c

Merge branch 'jk/gc-pre-detach-under-hook'

2017-07-18 12:48:10 -07:00

get-tar-commit-id.c

…

grep.c

Merge branch 'ab/grep-lose-opt-regflags'

2017-07-13 16:14:54 -07:00

hash-object.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

help.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

index-pack.c

Merge branch 'jt/unify-object-info'

2017-07-05 13:32:57 -07:00

init-db.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

interpret-trailers.c

Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init

2016-06-13 10:37:48 -07:00

log.c

Merge branch 'rs/use-div-round-up'

2017-07-12 15:18:23 -07:00

ls-files.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

ls-remote.c

wildmatch: remove unused wildopts parameter

2017-06-23 18:27:07 -07:00

ls-tree.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

mailinfo.c

prefix_filename: return newly allocated string

2017-03-21 11:18:41 -07:00

mailsplit.c

mailinfo & mailsplit: check for EOF while parsing

2017-05-08 12:18:19 +09:00

merge-base.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

merge-file.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

merge-index.c

Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ

2017-03-26 22:08:21 -07:00

merge-ours.c

…

merge-recursive.c

i18n: merge-recursive: mark verbose message for translation

2016-09-15 13:17:32 -07:00

merge-tree.c

Convert lookup_blob to struct object_id

2017-05-08 15:12:57 +09:00

merge.c

merge: save merge state earlier

2017-08-23 10:35:02 -07:00

mktag.c

…

mktree.c

mktree: plug memory leaks reported by Coverity

2017-05-08 12:18:19 +09:00

mv.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

name-rev.c

Merge branch 'ab/wildmatch'

2017-07-10 13:42:51 -07:00

notes.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

pack-objects.c

Merge branch 'ab/free-and-null'

2017-06-24 14:28:41 -07:00

pack-redundant.c

pack-redundant: plug memory leak

2017-05-08 12:18:19 +09:00

pack-refs.c

refs: delete pack_refs() in favor of refs_pack_refs()

2017-04-14 03:53:25 -07:00

patch-id.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

prune-packed.c

sha1_file: guard against invalid loose subdirectory numbers

2017-06-24 11:09:52 -07:00

prune.c

Merge branch 'rs/sha1-name-readdir-optim'

2017-07-05 13:32:56 -07:00

pull.c

Merge branch 'sb/pull-rebase-submodule'

2017-07-13 16:14:54 -07:00

push.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

read-tree.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

rebase--helper.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

receive-pack.c

Merge branch 'rs/use-div-round-up'

2017-07-12 15:18:23 -07:00

reflog.c

Merge branch 'ab/wildmatch'

2017-07-10 13:42:51 -07:00

remote-ext.c

remote-{ext,fd}: print usage message on invalid arguments

2017-05-30 14:45:04 +09:00

remote-fd.c

remote-{ext,fd}: print usage message on invalid arguments

2017-05-30 14:45:04 +09:00

remote.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

repack.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

replace.c

Merge branch 'ab/wildmatch'

2017-07-10 13:42:51 -07:00

rerere.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

reset.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

rev-list.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

rev-parse.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

revert.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

rm.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

send-pack.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

shortlog.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

show-branch.c

Merge branch 'ab/wildmatch'

2017-07-10 13:42:51 -07:00

show-ref.c

show-ref: remove a stale comment

2017-01-23 18:51:56 -08:00

stripspace.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

submodule--helper.c

Merge branch 'jc/utf8-fprintf' into maint

2017-07-10 13:59:09 -07:00

symbolic-ref.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

tag.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

unpack-file.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

unpack-objects.c

Merge branch 'ab/free-and-null'

2017-06-24 14:28:41 -07:00

update-index.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

update-ref.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

update-server-info.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

upload-archive.c

upload-archive: handle "-h" option early

2017-05-30 14:45:04 +09:00

var.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

verify-commit.c

Merge branch 'bw/config-h'

2017-06-24 14:28:41 -07:00

verify-pack.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

verify-tag.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00

worktree.c

Merge branch 'ab/free-and-null'

2017-06-24 14:28:41 -07:00

write-tree.c

config: don't include config.h by default

2017-06-15 12:56:22 -07:00