delta/git.git/t/t4128-apply-root.sh, branch maint-1.7.12

builtin-apply.c: pay attention to -p when determining the name

2009-11-27T03:02:24+00:00

The patch structure has def_name component that is used to validate the
sanity of a "diff --git" patch by checking pathnames that appear on the
patch header lines for consistency.  The git_header_name() function is
used to compute this out of "diff --git a/... b/..." line, but the code
always stripped one level of prefix (i.e. "a/" and "b/"), without paying
attention to -p option.  Code in find_name() function that parses other
lines in the patch header (e.g. "--- a/..." and "+++ b/..." lines) however
did strip the correct number of leading paths prefixes, and the sanity
check between these computed values failed.

Teach git_header_name() to honor -p option like find_name() function
does.

Found and reported by Steven J. Murdoch who also wrote tests.

Signed-off-by: Junio C Hamano

tests: shell negation portability fix

2008-10-13T15:43:04+00:00

Commit 969c8775 introduced a test which uses the non-portable construct:

  command1 && ! command2 | command3

which must be

  command1 && ! (command2 | command3)

to work on bsd shells (this is another example of bbf08124, which fixed
several similar cases).

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

git apply --directory broken for new files

2008-10-12T18:09:41+00:00

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 
Acked-by: Junio C Hamano 
Signed-off-by: Shawn O. Pearce

git-apply --directory: make --root more similar to GNU diff

2008-07-07T02:33:08+00:00

Applying a patch in the directory that is different from what the patch
records is done with --directory option in GNU diff.  The --root option we
introduced previously does the same, and we can call it the same way to
give users more familiar feel.

Signed-off-by: Junio C Hamano

apply --root: thinkofix.

2008-07-02T22:28:22+00:00

The end of a string is string[length-1], not string[length+1].
I pointed it out during the review, but I forgot about it when applying the
patch.  This should fix it.

Signed-off-by: Junio C Hamano

Teach "git apply" to prepend a prefix with "--root="

2008-07-02T01:04:28+00:00

With "git apply --root=", all file names in the patch are prepended
with .  If a "-p" value was given, the paths are stripped _before_
prepending .

Wished for by HPA.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano