Re: problem with parsing of patch files for patch-id
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 21, 2024, 18:53 UTC
- Message-ID
- <xmqq7ceiktzj.fsf@gitster.g>
- In-Reply-To
- <xmqqbk3uns4s.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
Show 20 quoted lines
> Rob Linden <rlinden@redhat.com> writes: > >> This patch (also attached) fixes it by only considering commit hashes >> in a "From xxxxx..." line: > > If I am not mistaken, "git patch-id" was designed to read from > > git rev-list ... commit range ... | git diff-tree --stdin -p > > where we see > > 9005149a4a77e2d3409c6127bf4fd1a0893c3495 > diff --git a/path b/path > index ... > ... patch text here ... > > so I would suspect that limiting the commit object names only to > those that follow "From " (i.e. the format-patch output or output > with the "--format=email" option) would break existing use cases big > time.
Let's do this to make sure we have a baseline that we will not break.
------- >8 ------------- >8 ------------- >8 ------- [PATCH] t4204: patch-id supports various input format
"git patch-id" was first developed to read from "git diff-tree --stdin -p" output. Later it was enhanced to read from "git diff-tree --stdin -p -v", which was the downstream of an early imitation of "git log" ("git rev-list" run in the upstream of a pipe to feed the "diff-tree"). These days, we also read from "git format-patch".
Their output begins slightly differently, but the patch-id computed over them for the same commit should be the same. Ensure that we won't accidentally break this expectation.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- t/t4204-patch-id.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
diff --git c/t/t4204-patch-id.sh w/t/t4204-patch-id.sh index 605faea0c7..ebce72b2ce 100755 --- c/t/t4204-patch-id.sh +++ w/t/t4204-patch-id.sh @@ -114,6 +114,29 @@ test_expect_success 'patch-id supports git-format-patch output' ' test "$2" = $(git rev-parse HEAD) ' +test_expect_success 'patch-id computes the same for various formats' ' + # This test happens to consider "git log -p -1" output + # the canonical input format, so use it as the norm. + git log -1 -p same >log-p.output && + git patch-id <log-p.output >expect && + + # format-patch begins with "From <commit object name>" + git format-patch -1 --stdout same >format-patch.output && + git patch-id <format-patch.output >actual && + test_cmp actual expect && + + # "diff-tree --stdin -p" begins with "<commit object name>" + same=$(git rev-parse same) && + echo $same | git diff-tree --stdin -p >diff-tree.output && + git patch-id <diff-tree.output >actual && + test_cmp actual expect && + + # "diff-tree --stdin -v -p" begins with "commit <commit object name>" + echo $same | git diff-tree --stdin -p -v >diff-tree-v.output && + git patch-id <diff-tree-v.output >actual && + test_cmp actual expect +' + test_expect_success 'whitespace is irrelevant in footer' ' get_patch_id main && git checkout same &&