From: Junio C Hamano <gitster@pobox.com>
To: Miklos Vajna <vmiklos@suse.cz>
Cc: git@vger.kernel.org, Robin Stocker <robin@nibor.org>
Subject: Re: [PATCH v2] cherry-pick: don't forget -s on failure
Date: Thu, 13 Sep 2012 10:23:13 -0700 [thread overview]
Message-ID: <7v8vcdalby.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20120913073324.GA14383@suse.cz> (Miklos Vajna's message of "Thu, 13 Sep 2012 09:33:25 +0200")
Miklos Vajna <vmiklos@suse.cz> writes:
> +void append_signoff(struct strbuf *msgbuf, int ignore_footer)
> +{
> + struct strbuf sob = STRBUF_INIT;
> + int i;
> +
> + strbuf_addstr(&sob, sign_off_header);
> + strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"),
> + getenv("GIT_COMMITTER_EMAIL")));
> + strbuf_addch(&sob, '\n');
> + for (i = msgbuf->len - 1 - ignore_footer; i > 0 && msgbuf->buf[i - 1] != '\n'; i--)
> + ; /* do nothing */
> + if (prefixcmp(msgbuf->buf + i, sob.buf)) {
> + if (!i || !ends_rfc2822_footer(msgbuf))
> + strbuf_addch(msgbuf, '\n');
> + strbuf_addbuf(msgbuf, &sob);
> + }
> + strbuf_release(&sob);
> +}
Hrm, what is this thing trying to do? It does start scanning from
the end (ignoring the "Conflicts:" thing) to see who the last person
that signed it off was, but once it decides that it needs to add a
new sign-off, it still adds it at the very end anyway.
next prev parent reply other threads:[~2012-09-13 17:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-12 19:57 [PATCH] cherry-pick: don't forget -s on failure Miklos Vajna
2012-09-12 22:32 ` Junio C Hamano
2012-09-12 22:45 ` Junio C Hamano
2012-09-13 7:33 ` [PATCH v2] " Miklos Vajna
2012-09-13 17:04 ` Junio C Hamano
2012-09-13 17:23 ` Junio C Hamano [this message]
2012-09-13 20:27 ` [PATCH v3] " Miklos Vajna
2012-09-13 21:13 ` Junio C Hamano
2012-09-14 6:52 ` [PATCH v4] " Miklos Vajna
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v8vcdalby.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=robin@nibor.org \
--cc=vmiklos@suse.cz \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).