From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Thu, 06 Jun 2013 12:17:56 GMT
Subject: Re: [PATCH v3 6/9] cherry-pick: add support to copy notes
Message-ID: <CAMP44s2Jo9A-Dr3S-Pcj6WQ8W4Wg9dLn_f-WGyVZ2Bp4JysBCw@mail.gmail.com>
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