From: Elijah Newren <newren@gmail.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, sunshine@sunshineco.com,
Elijah Newren <newren@gmail.com>
Subject: [PATCH v3 0/2] Address recovery failures with directory/file conflicts
Date: Tue, 31 Jul 2018 10:12:03 -0700 [thread overview]
Message-ID: <20180731171205.4794-1-newren@gmail.com> (raw)
In-Reply-To: <20180713163331.22446-1-newren@gmail.com>
This patch series fixes several "recovery" commands that outright fail
or do not fully recover when directory-file conflicts are present.
This includes:
* git read-tree --reset HEAD
* git am --skip
* git am --abort
* git merge --abort (or git reset --merge)
* git reset --hard
Changes since v2 (full range-diff below):
- Backported to maint (there were some textual conflicts in t6042
due to the merging of en/merge-recursive-tests to master), because
of this comment from Junio's what's cooking email:
"This may have to be rebased on an older maintenance track before
moving forward."
Elijah Newren (2):
t1015: demonstrate directory/file conflict recovery failures
read-cache: fix directory/file conflict handling in
read_index_unmerged()
read-cache.c | 13 +--
t/t1015-read-index-unmerged.sh | 123 +++++++++++++++++++++++++++
t/t6020-merge-df.sh | 3 -
t/t6042-merge-rename-corner-cases.sh | 2 -
4 files changed, 131 insertions(+), 10 deletions(-)
create mode 100755 t/t1015-read-index-unmerged.sh
1: 4a1c9c3368 ! 1: 00f94a8b41 t1015: demonstrate directory/file conflict recovery failures
@@ -14,7 +14,6 @@
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
- Message-Id: <20180713163331.22446-2-newren@gmail.com>
diff --git a/t/t1015-read-index-unmerged.sh b/t/t1015-read-index-unmerged.sh
new file mode 100755
2: e105e8bfbd ! 2: d3b8d7edb6 read-cache: fix directory/file conflict handling in read_index_unmerged()
@@ -59,7 +59,6 @@
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
- Message-Id: <20180713163331.22446-3-newren@gmail.com>
diff --git a/read-cache.c b/read-cache.c
--- a/read-cache.c
@@ -150,10 +149,18 @@
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6042-merge-rename-corner-cases.sh
@@
- (
- cd rename-directory-1 &&
+ '
+
+ test_expect_success 'rename/directory conflict + clean content merge' '
+- git reset --hard &&
+ git reset --hard &&
+ git clean -fdqx &&
-- git reset --hard &&
- git reset --hard &&
- git clean -fdqx &&
+@@
+ '
+
+ test_expect_success 'rename/directory conflict + content merge conflict' '
+- git reset --hard &&
+ git reset --hard &&
+ git clean -fdqx &&
--
2.18.0.2.gf4c50c7885
next prev parent reply other threads:[~2018-07-31 17:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-11 5:18 [PATCH 0/2] Address recovery failures with directory/file conflicts Elijah Newren
2018-07-11 5:18 ` [PATCH 1/2] t1015: demonstrate directory/file conflict recovery failures Elijah Newren
2018-07-11 9:21 ` Eric Sunshine
2018-07-11 18:23 ` Elijah Newren
2018-07-11 5:18 ` [PATCH 2/2] read-cache: fix directory/file conflict handling in read_index_unmerged() Elijah Newren
2018-07-11 17:03 ` Junio C Hamano
2018-07-11 18:24 ` Elijah Newren
2018-07-13 16:33 ` [PATCH v2 0/2] Address recovery failures with directory/file conflicts Elijah Newren
2018-07-13 16:33 ` [PATCH v2 1/2] t1015: demonstrate directory/file conflict recovery failures Elijah Newren
2018-07-13 16:33 ` [PATCH v2 2/2] read-cache: fix directory/file conflict handling in read_index_unmerged() Elijah Newren
2018-07-13 16:45 ` [PATCH v2 0/2] Address recovery failures with directory/file conflicts Elijah Newren
2018-07-31 17:12 ` Elijah Newren [this message]
2018-07-31 17:12 ` [PATCH v3 1/2] t1015: demonstrate directory/file conflict recovery failures Elijah Newren
2018-07-31 17:12 ` [PATCH v3 2/2] read-cache: fix directory/file conflict handling in read_index_unmerged() Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180731171205.4794-1-newren@gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.