Code

git apply --directory broken for new files
authorJeff King <peff@peff.net>
Sun, 12 Oct 2008 04:06:11 +0000 (00:06 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Sun, 12 Oct 2008 18:09:41 +0000 (11:09 -0700)
commit969c877506cf8cc760c7b251fef6c5b6850bfc19
tree641fc1ff05577feac95f81d139637e726ac9848f
parentff74126c03a8dfd04e7533573a5c420f2a7112ac
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>
builtin-apply.c
t/t4128-apply-root.sh