7552266aac
Using (DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH) causes Git to emit a
"---" line between the commit message and the body of the patch, which
fixes a regression introduced in commit 455b598 (ui-patch.c: Use
log_tree_commit() to generate diffs, 2013-08-20), prior to which we
inserted the "---" line ourselves.
DIFF_FORMAT_SUMMARY is added so that we match the output of
git-format-patch(1) without the "-p" option.
Signed-off-by: John Keeping <john@keeping.me.uk>
63 خطوط
1.7 KiB
Bash
Executable File
63 خطوط
1.7 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='Check content on patch page'
|
|
. ./setup.sh
|
|
|
|
test_expect_success 'generate foo/patch' '
|
|
cgit_query "url=foo/patch" >tmp
|
|
'
|
|
|
|
test_expect_success 'find `From:` line' '
|
|
grep "^From: " tmp
|
|
'
|
|
|
|
test_expect_success 'find `Date:` line' '
|
|
grep "^Date: " tmp
|
|
'
|
|
|
|
test_expect_success 'find `Subject:` line' '
|
|
grep "^Subject: commit 5" tmp
|
|
'
|
|
|
|
test_expect_success 'find `cgit` signature' '
|
|
tail -2 tmp | head -1 | grep "^cgit"
|
|
'
|
|
|
|
test_expect_success 'compare with output of git-format-patch(1)' '
|
|
CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" ../../VERSION) &&
|
|
git --git-dir="$PWD/repos/foo/.git" format-patch --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD^ >tmp2 &&
|
|
strip_headers <tmp >tmp_ &&
|
|
test_cmp tmp_ tmp2
|
|
'
|
|
|
|
test_expect_success 'find initial commit' '
|
|
root=$(git --git-dir="$PWD/repos/foo/.git" rev-list --max-parents=0 HEAD)
|
|
'
|
|
|
|
test_expect_success 'generate patch for initial commit' '
|
|
cgit_query "url=foo/patch&id=$root" >tmp
|
|
'
|
|
|
|
test_expect_success 'find `cgit` signature' '
|
|
tail -2 tmp | head -1 | grep "^cgit"
|
|
'
|
|
|
|
test_expect_success 'generate patches for multiple commits' '
|
|
id=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD) &&
|
|
id2=$(git --git-dir="$PWD/repos/foo/.git" rev-parse HEAD~3) &&
|
|
cgit_query "url=foo/patch&id=$id&id2=$id2" >tmp
|
|
'
|
|
|
|
test_expect_success 'find `cgit` signature' '
|
|
tail -2 tmp | head -1 | grep "^cgit"
|
|
'
|
|
|
|
test_expect_success 'compare with output of git-format-patch(1)' '
|
|
CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" ../../VERSION) &&
|
|
git --git-dir="$PWD/repos/foo/.git" format-patch -N --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD~3..HEAD >tmp2 &&
|
|
strip_headers <tmp >tmp_ &&
|
|
test_cmp tmp_ tmp2
|
|
'
|
|
|
|
test_done
|