diff options
| author |  Jeff King <peff@peff.net> | 2008-10-12 00:06:11 -0400 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2008-10-12 11:09:41 -0700 |
| commit | 969c877506cf8cc760c7b251fef6c5b6850bfc19 (patch) | |
| tree | 641fc1ff05577feac95f81d139637e726ac9848f /builtin-archive.c | |
| parent | rebase -i: do not fail when there is no commit to cherry-pick (diff) | |
| download | tgif-969c877506cf8cc760c7b251fef6c5b6850bfc19.tar.xz | |
git apply --directory broken for new files
We carefully verify that the input to git-apply is sane,
including cross-checking that the filenames we see in "+++"
headers match what was provided on the command line of "diff
--git". When --directory is used, however, we ended up
comparing the unadorned name to one with the prepended root,
causing us to complain about a mismatch.
We simply need to prepend the root directory, if any, when
pulling the name out of the git header.
Signed-off-by: Jeff King <peff@peff.net>
Acked-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'builtin-archive.c')
0 files changed, 0 insertions, 0 deletions