From: kevin at scrye.com (Kevin Fenzi)
Subject: odd patch issue
Date: Wed, 16 Mar 2016 12:43:14 -0600 [thread overview]
Message-ID: <20160316124314.67f9dc83@sheelba.scrye.com> (raw)
In-Reply-To: <20160314224450.GB20327@serenity.lan>
On Mon, 14 Mar 2016 22:44:50 +0000
John Keeping <john at keeping.me.uk> wrote:
> Indeed it did, so I think we should do this:
Sorry for the delay here. I finally tested this and indeed it fixes the
issue. ;)
Thanks!
kevin
--
>
> -- >8 --
> Subject: [PATCH] patch: reapply path limit
>
> This was originally applied added in commit eac1b67 (ui-patch: Apply
> path limit to generated patch, 2010-06-10) but the ability to limit
> patches to particular paths was lost in commit 455b598 (ui-patch.c:
> Use log_tree_commit() to generate diffs, 2013-08-20).
>
> The new output is slightly different from the original because Git's
> diff infrastructure doesn't give us a way to insert an annotation
> immediately after the "---" separator, so the commit has moved below
> the diff stat.
>
> Signed-off-by: John Keeping <john at keeping.me.uk>
> ---
> ui-patch.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/ui-patch.c b/ui-patch.c
> index 4c051e8..e8b5338 100644
> --- a/ui-patch.c
> +++ b/ui-patch.c
> @@ -18,9 +18,13 @@ void cgit_print_patch(const char *new_rev, const
> char *old_rev, struct commit *commit;
> unsigned char new_rev_sha1[20], old_rev_sha1[20];
> char rev_range[2 * 40 + 3];
> - char *rev_argv[] = { NULL, "--reverse", "--format=email",
> rev_range };
> + const char *rev_argv[] = { NULL, "--reverse",
> "--format=email", rev_range, "--", prefix };
> + int rev_argc = ARRAY_SIZE(rev_argv);
> char *patchname;
>
> + if (!prefix)
> + rev_argc--;
> +
> if (!new_rev)
> new_rev = ctx.qry.head;
>
> @@ -79,7 +83,9 @@ void cgit_print_patch(const char *new_rev, const
> char *old_rev, rev.max_parents = 1;
> rev.diffopt.output_format |= DIFF_FORMAT_DIFFSTAT |
> DIFF_FORMAT_PATCH | DIFF_FORMAT_SUMMARY;
> - setup_revisions(ARRAY_SIZE(rev_argv), (const char
> **)rev_argv, &rev,
> + if (prefix)
> + rev.diffopt.stat_sep = fmt("(limited to '%s')\n\n",
> prefix);
> + setup_revisions(ARRAY_SIZE(rev_argv), rev_argv, &rev,
> NULL);
> prepare_revision_walk(&rev);
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20160316/144ca2c0/attachment.asc>
prev parent reply other threads:[~2016-03-16 18:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-14 19:46 kevin
2016-03-14 21:20 ` john
2016-03-14 21:44 ` kevin
2016-03-14 22:44 ` john
2016-03-16 18:43 ` kevin [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=20160316124314.67f9dc83@sheelba.scrye.com \
--to=cgit@lists.zx2c4.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).