about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rwxr-xr-xtests/t0108-patch.sh4
-rw-r--r--ui-patch.c3
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' '
25 25
26test_expect_success 'compare with output of git-format-patch(1)' ' 26test_expect_success 'compare with output of git-format-patch(1)' '
27 CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" ../../VERSION) && 27 CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" ../../VERSION) &&
28 git --git-dir="$PWD/repos/foo/.git" format-patch -p --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD^ >tmp2 && 28 git --git-dir="$PWD/repos/foo/.git" format-patch --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD^ >tmp2 &&
29 strip_headers <tmp >tmp_ && 29 strip_headers <tmp >tmp_ &&
30 test_cmp tmp_ tmp2 30 test_cmp tmp_ tmp2
31' 31'
@@ -54,7 +54,7 @@ test_expect_success 'find `cgit` signature' '
54 54
55test_expect_success 'compare with output of git-format-patch(1)' ' 55test_expect_success 'compare with output of git-format-patch(1)' '
56 CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" ../../VERSION) && 56 CGIT_VERSION=$(sed -n "s/CGIT_VERSION = //p" ../../VERSION) &&
57 git --git-dir="$PWD/repos/foo/.git" format-patch -p -N --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD~3..HEAD >tmp2 && 57 git --git-dir="$PWD/repos/foo/.git" format-patch -N --subject-prefix="" --signature="cgit $CGIT_VERSION" --stdout HEAD~3..HEAD >tmp2 &&
58 strip_headers <tmp >tmp_ && 58 strip_headers <tmp >tmp_ &&
59 test_cmp tmp_ tmp2 59 test_cmp tmp_ tmp2
60' 60'
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,
73 rev.diff = 1; 73 rev.diff = 1;
74 rev.show_root_diff = 1; 74 rev.show_root_diff = 1;
75 rev.max_parents = 1; 75 rev.max_parents = 1;
76 rev.diffopt.output_format |= DIFF_FORMAT_PATCH; 76 rev.diffopt.output_format |= DIFF_FORMAT_DIFFSTAT |
77 DIFF_FORMAT_PATCH | DIFF_FORMAT_SUMMARY;
77 setup_revisions(ARRAY_SIZE(rev_argv), (const char **)rev_argv, &rev, 78 setup_revisions(ARRAY_SIZE(rev_argv), (const char **)rev_argv, &rev,
78 NULL); 79 NULL);
79 prepare_revision_walk(&rev); 80 prepare_revision_walk(&rev);