From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 3/3] t4301: add a test case involving a rename, type change & modification
Date: Fri, 19 Aug 2022 06:57:36 +0000 [thread overview]
Message-ID: <3b4ed8bb1bb615277ee51a7b2af5fc53bae0a6e4.1660892256.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1327.git.1660892256.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
This is a reduced version of a real-world scenario that triggered the
work on the original file names.
Let's make sure that Git does not regress in that scenario.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
t/t4301-merge-tree-write-tree.sh | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/t/t4301-merge-tree-write-tree.sh b/t/t4301-merge-tree-write-tree.sh
index e08452a8531..3c41ade0a47 100755
--- a/t/t4301-merge-tree-write-tree.sh
+++ b/t/t4301-merge-tree-write-tree.sh
@@ -137,6 +137,38 @@ test_expect_success 'test conflict notices and such' '
test_cmp expect actual
'
+test_expect_success SYMLINKS 'original file names and type changes' '
+ git switch --detach side1^ &&
+ test_commit modified whatever &&
+
+ git switch --detach HEAD^ &&
+ git mv whatever wherever &&
+ ln -s wherever whatever &&
+ git add whatever &&
+ test_tick &&
+ git commit -m symlink &&
+ git tag symlink &&
+
+ test_expect_code 1 \
+ git merge-tree -z modified symlink >out &&
+ printf "\\n" >>out &&
+ anonymize_hash out >actual &&
+
+ q_to_tab <<-\EOF | lf_to_nul >expect &&
+ HASH
+ 120000 HASH 3Qwhatever
+ 100644 HASH 1Qwhatever
+ 100644 HASH 2Qwhatever
+
+ EOF
+
+ q_to_nul <<-EOF >>expect &&
+ 2QwhateverQwhatever~modifiedQCONFLICT (distinct modes)QCONFLICT (distinct types): whatever had different types on each side; renamed one of them so each can be recorded somewhere.
+ Q
+ EOF
+ test_cmp expect actual
+'
+
for opt in $(git merge-tree --git-completion-helper-all)
do
if test $opt = "--trivial-merge" || test $opt = "--write-tree"
--
gitgitgadget
prev parent reply other threads:[~2022-08-19 6:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-19 6:57 [PATCH 0/3] Show original filenames in merge tree Johannes Schindelin via GitGitGadget
2022-08-19 6:57 ` [PATCH 1/3] merge-tree -z: always show the original file name first Johannes Schindelin via GitGitGadget
2022-08-19 9:17 ` Johannes Schindelin
2022-08-20 23:22 ` Elijah Newren
2022-08-20 23:17 ` Elijah Newren
2022-08-21 2:00 ` Elijah Newren
2022-08-22 20:12 ` Johannes Schindelin
2022-08-23 6:24 ` Elijah Newren
2022-08-26 15:35 ` Johannes Schindelin
2022-08-30 2:13 ` Elijah Newren
2022-08-19 6:57 ` [PATCH 2/3] merge-tree: show the original file names in the conflict output Johannes Schindelin via GitGitGadget
2022-08-19 6:57 ` Johannes Schindelin via GitGitGadget [this message]
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=3b4ed8bb1bb615277ee51a7b2af5fc53bae0a6e4.1660892256.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=newren@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).