* [PATCH 1/2] t0108: modernize style
@ 2014-12-28 13:10 john
2014-12-28 13:10 ` [PATCH 2/2] ui-patch: match git-format-patch(1) output john
2014-12-28 13:43 ` [PATCH 1/2] t0108: modernize style Jason
0 siblings, 2 replies; 4+ messages in thread
From: john @ 2014-12-28 13:10 UTC (permalink / raw)
* &&-chaining
* use test_cmp instead of cmp
* use strip_headers instead of knowing how many lines there will be
Signed-off-by: John Keeping <john at keeping.me.uk>
---
tests/t0108-patch.sh | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/tests/t0108-patch.sh b/tests/t0108-patch.sh
index fcc749d..4e8aba3 100755
--- a/tests/t0108-patch.sh
+++ b/tests/t0108-patch.sh
@@ -24,10 +24,10 @@ test_expect_success 'find `cgit` signature' '
'
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 -p --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD^ >tmp2
- sed "1,5d" tmp >tmp_
- cmp tmp_ tmp2
+ CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" ../../VERSION) &&
+ git --git-dir="$PWD/repos/foo/.git" format-patch -p --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD^ >tmp2 &&
+ strip_headers <tmp >tmp_ &&
+ test_cmp tmp_ tmp2
'
test_expect_success 'find initial commit' '
@@ -43,8 +43,8 @@ test_expect_success 'find `cgit` signature' '
'
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)
+ 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
'
@@ -53,10 +53,10 @@ test_expect_success 'find `cgit` signature' '
'
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 -p -N --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD~3..HEAD >tmp2
- sed "1,5d" tmp >tmp_
- cmp tmp_ tmp2
+ CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" ../../VERSION) &&
+ git --git-dir="$PWD/repos/foo/.git" format-patch -p -N --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD~3..HEAD >tmp2 &&
+ strip_headers <tmp >tmp_ &&
+ test_cmp tmp_ tmp2
'
test_done
--
2.2.1.286.gdf3164c
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2] ui-patch: match git-format-patch(1) output
2014-12-28 13:10 [PATCH 1/2] t0108: modernize style john
@ 2014-12-28 13:10 ` john
2014-12-28 13:44 ` Jason
2014-12-28 13:43 ` [PATCH 1/2] t0108: modernize style Jason
1 sibling, 1 reply; 4+ messages in thread
From: john @ 2014-12-28 13:10 UTC (permalink / raw)
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 at keeping.me.uk>
---
tests/t0108-patch.sh | 4 ++--
ui-patch.c | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/t0108-patch.sh b/tests/t0108-patch.sh
index 4e8aba3..013d680 100755
--- a/tests/t0108-patch.sh
+++ b/tests/t0108-patch.sh
@@ -25,7 +25,7 @@ test_expect_success 'find `cgit` signature' '
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 -p --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD^ >tmp2 &&
+ 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
'
@@ -54,7 +54,7 @@ test_expect_success 'find `cgit` signature' '
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 -p -N --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD~3..HEAD >tmp2 &&
+ 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
'
diff --git a/ui-patch.c b/ui-patch.c
index fc6c145..6ec89b4 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -73,7 +73,8 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
rev.diff = 1;
rev.show_root_diff = 1;
rev.max_parents = 1;
- rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
+ rev.diffopt.output_format |= DIFF_FORMAT_DIFFSTAT |
+ DIFF_FORMAT_PATCH | DIFF_FORMAT_SUMMARY;
setup_revisions(ARRAY_SIZE(rev_argv), (const char **)rev_argv, &rev,
NULL);
prepare_revision_walk(&rev);
--
2.2.1.286.gdf3164c
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] t0108: modernize style
2014-12-28 13:10 [PATCH 1/2] t0108: modernize style john
2014-12-28 13:10 ` [PATCH 2/2] ui-patch: match git-format-patch(1) output john
@ 2014-12-28 13:43 ` Jason
1 sibling, 0 replies; 4+ messages in thread
From: Jason @ 2014-12-28 13:43 UTC (permalink / raw)
Merged, thanks.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20141228/8d9d1b5f/attachment.html>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2] ui-patch: match git-format-patch(1) output
2014-12-28 13:10 ` [PATCH 2/2] ui-patch: match git-format-patch(1) output john
@ 2014-12-28 13:44 ` Jason
0 siblings, 0 replies; 4+ messages in thread
From: Jason @ 2014-12-28 13:44 UTC (permalink / raw)
Excellent, thank you.
Merged.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20141228/71e7251c/attachment.html>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-12-28 13:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-28 13:10 [PATCH 1/2] t0108: modernize style john
2014-12-28 13:10 ` [PATCH 2/2] ui-patch: match git-format-patch(1) output john
2014-12-28 13:44 ` Jason
2014-12-28 13:43 ` [PATCH 1/2] t0108: modernize style Jason
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).