| commit | f276cae18799ac8df2495b93cf0359a413789891 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Apr 2016 22:17:15 +0000 (25 15:17 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Apr 2016 22:17:15 +0000 (25 15:17 -0700) | ||
| tree | 88b4e119a06608fff800400d59dd4ee51a58c64a | treesnapshot (tar.gz zip) |
| parent | 9058b8f043f5dd287b6587373f031d79694b6024 | commitdiff |
| parent | 40d71940b6a0dadb7873cce614992f1d71fcdfbd | commitdiff |
Merge branch 'en/merge-trivial-fix'
When "git merge" notices that the merge can be resolved purely at
the tree level (without having to merge blobs) and the resulting
tree happens to already exist in the object store, it forgot to
update the index, which lead to an inconsistent state for later
operations.
* en/merge-trivial-fix:
builtin/merge.c: fix a bug with trivial merges
t7605: add a testcase demonstrating a bug with trivial merges
When "git merge" notices that the merge can be resolved purely at
the tree level (without having to merge blobs) and the resulting
tree happens to already exist in the object store, it forgot to
update the index, which lead to an inconsistent state for later
operations.
* en/merge-trivial-fix:
builtin/merge.c: fix a bug with trivial merges
t7605: add a testcase demonstrating a bug with trivial merges
| builtin/merge.c | diff1 | diff2 | blobhistory |