From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Jonathan Nieder <jrnieder@gmail.com>,
Ramkumar Ramachandra <artagnon@gmail.com>,
Christian Couder <chriscool@tuxfamily.org>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: Re: [PATCH v3 6/9] cherry-pick: add support to copy notes
Date: Thu, 6 Jun 2013 07:17:56 -0500 [thread overview]
Message-ID: <CAMP44s2Jo9A-Dr3S-Pcj6WQ8W4Wg9dLn_f-WGyVZ2Bp4JysBCw@mail.gmail.com> (raw)
In-Reply-To: <1370509144-31974-7-git-send-email-felipe.contreras@gmail.com>
On Thu, Jun 6, 2013 at 3:59 AM, Felipe Contreras
<felipe.contreras@gmail.com> wrote:
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---
> sequencer.c | 33 +++++++++++++++++++++++++++++----
> 1 file changed, 29 insertions(+), 4 deletions(-)
>
> diff --git a/sequencer.c b/sequencer.c
> index 74480d7..6d13e63 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -14,6 +14,7 @@
> #include "merge-recursive.h"
> #include "refs.h"
> #include "argv-array.h"
> +#include "builtin.h"
>
> #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
>
> @@ -158,6 +159,32 @@ static void run_rewrite_hook(const char *name)
> finish_command(&proc);
> }
>
> +static void copy_notes(const char *name)
> +{
> + struct notes_rewrite_cfg *cfg;
> + int i;
> +
> + cfg = init_copy_notes_for_rewrite(name);
> + if (!cfg)
> + return;
> +
> + for (i = 0; i < rewritten.nr; i++) {
> + struct rewritten_list_item *item = &rewritten.items[i];
> + copy_note_for_rewrite(cfg, item->from, item->to);
> + }
> +
> + finish_copy_notes_for_rewrite(cfg);
> +}
Unfortunately this doesn't work, because all these functions are part
of the builtins, not git lib.
--
Felipe Contreras
next prev parent reply other threads:[~2013-06-06 12:23 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-06 8:58 [PATCH v3 0/9] cherry-pick: improvements Felipe Contreras
2013-06-06 8:58 ` [PATCH v3 1/9] sequencer: remove useless indentation Felipe Contreras
2013-06-06 8:58 ` [PATCH v3 2/9] sequencer: trivial fix Felipe Contreras
2013-06-06 8:58 ` [PATCH v3 3/9] cherry-pick: add --skip-empty option Felipe Contreras
2013-06-06 18:30 ` Junio C Hamano
2013-06-06 18:34 ` Felipe Contreras
2013-06-06 19:21 ` Junio C Hamano
2013-06-06 19:21 ` Junio C Hamano
2013-06-07 20:28 ` Felipe Contreras
2013-06-06 8:58 ` [PATCH v3 4/9] cherry-pick: store rewritten commits Felipe Contreras
2013-06-06 8:59 ` [PATCH v3 5/9] sequencer: run post-rewrite hook Felipe Contreras
2013-06-06 18:40 ` Junio C Hamano
2013-06-09 15:19 ` Felipe Contreras
2013-06-06 8:59 ` [PATCH v3 6/9] cherry-pick: add support to copy notes Felipe Contreras
2013-06-06 12:17 ` Felipe Contreras [this message]
2013-06-06 8:59 ` [PATCH v3 7/9] revert/cherry-pick: add --quiet option Felipe Contreras
2013-06-06 8:59 ` [PATCH v3 8/9] revert/cherry-pick: add --skip option Felipe Contreras
2013-06-06 8:59 ` [PATCH v3 9/9] cherry-pick: don't barf when there's nothing to do Felipe Contreras
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=CAMP44s2Jo9A-Dr3S-Pcj6WQ8W4Wg9dLn_f-WGyVZ2Bp4JysBCw@mail.gmail.com \
--to=felipe.contreras@gmail.com \
--cc=artagnon@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.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.
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).