From: Sverre Rabbelier Date: Tue, 29 Dec 2009 14:06:16 GMT Subject: Re: [PATCH] Add --path-prefix option to git-fast-import Message-ID: 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 wrote: > +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