Re: [PATCH] Add --path-prefix option to git-fast-import

From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Dec 29, 2009, 14:06 UTC
Message-ID: <fabb9a1e0912290606ib1f2e46y1ddbae9aa68e5194@mail.gmail.com>
In-Reply-To: <1262091083-25401-1-git-send-email-gisle.aas@it.uib.no>

Heya,

On Tue, Dec 29, 2009 at 06:51, Gisle Aas <gisle.aas@it.uib.no> wrote:

Show 19 quoted lines

> +static const char *path_prefix_prepend(struct strbuf *sb, const char *p)
> +{
> +       if (p != sb->buf) {
> +           strbuf_reset(sb);
> +           strbuf_addstr(sb, p);
> +       }
> +       strbuf_insert(sb, 0, path_prefix, path_prefix_len);
> +       return sb->buf;
> +}
> +
>  static void file_change_m(struct branch *b)
>  {
>        const char *p = command_buf.buf + 2;
> @@ -1909,6 +1921,8 @@ static void file_change_m(struct branch *b)
>                        die("Garbage after path in: %s", command_buf.buf);
>                p = uq.buf;
>        }
> +       if (path_prefix)
> +           p = path_prefix_prepend(&uq, p);

You could reduce the size of this change by having path_prefix_prepend check for path_prefix and just do nothing if it is not set.

-- 
Cheers,

Sverre Rabbelier