]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d516b2d) | patch
t6424: make sure a failed merge preserves local changes
authorJunio C Hamano <gitster@pobox.com>
Thu, 19 May 2022 18:59:53 +0000 (11:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 May 2022 19:03:00 +0000 (12:03 -0700)
commit4b317450ce140c8c188afba79aed9a2e8e95d79e
treeb772dbb8bca91b2f6941fa2cd036984632dbda9btree | snapshot
parentd516b2db0af2221bd6b13e7347abdcb5830b2829commit | diff
t6424: make sure a failed merge preserves local changes

We do make sure that an attempt to merge with various forms of local
changes will "fail", but the point of stopping the merge is so that
we refrain from discarding uncommitted local changes that could be
precious.  Add a few more checks for each case to make sure the
local changes are left intact.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6424-merge-unrelated-index-changes.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.