git/apply.c, branch v1.2.2

Use sha1_file.c's mkdir-like routine in apply.c.

2006-02-04T07:35:14Z

As far as I can see, create_subdirectories() in apply.c just duplicates the functionality of safe_create_leading_directories() from sha1_file.c. The former has a warm, fuzzy const parameter, but that's not important. The potential problem with EEXIST and creating directories should never occur here, but will be removed by future safe_create_leading_directories() changes. Other uses of EEXIST in apply.c should be fine barring intentionally malicious behavior. Signed-off-by: Jason Riedy Signed-off-by: Junio C Hamano

Make apply accept the -pNUM option like patch does.

2006-02-01T00:22:01Z

This only applies to traditional diffs, not to git diffs. Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano

fix potential deadlock in create_one_file

2006-01-06T01:22:49Z

It can happen if the temporary file already exists (i.e. after a panic and reboot). Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano

trivial: O_EXCL makes O_TRUNC redundant

2006-01-06T01:22:47Z

Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano

xread/xwrite: do not worry about EINTR at calling sites.

2005-12-20T02:28:16Z

We had errno==EINTR check after read(2)/write(2) sprinkled all over the places, always doing continue. Consolidate them into xread()/xwrite() wrapper routines. Credits for suggestion goes to HPA -- bugs are mine. Signed-off-by: Junio C Hamano

git-apply: work from subdirectory.

2005-11-29T07:13:01Z

When applying a patch to index file, we need to know where GIT_DIR is; use setup_git_directory() to find it out. This also allows us to work from a subdirectory if we wanted to. When git-apply is run from a subdirectory, it applies the given patch only to the files under the current directory and below. Signed-off-by: Junio C Hamano

Deal with binary diff output from GNU diff 2.8.7

2005-11-18T05:14:29Z

Some vintage of diff says just "Files X and Y differ\n", instead of "Binary files X and Y differ\n", so catch both patterns. Signed-off-by: Junio C Hamano

apply: allow-binary-replacement.

2005-11-17T00:20:40Z

A new option, --allow-binary-replacement, is introduced. When you feed a diff that records full SHA1 name of pre- and post-image blob on its index line to git-apply with this option, the post-image blob replaces the path if what you have in the working tree matches the pre-image _and_ post-image blob is already available in the object directory. Later we _might_ want to enhance the diff output to also include the full binary data of the post-image, to make this more useful, but this is good enough for local rebasing application. Signed-off-by: Junio C Hamano

git-apply: fail if a patch cannot be applied.

2005-11-16T22:12:56Z

Recently we fixed 'git-apply --stat' not to barf on a binary differences. But it accidentally broke the error detection when we actually attempt to apply them. This commit fixes the problem and adds test cases. Signed-off-by: Junio C Hamano

apply: fix binary patch detection.

2005-11-15T01:15:07Z

The comparison to find "Binary files " string was looking at a wrong place when offset != 0. Also, we may have the full 40-byte textual sha1 on the index line; two off-by-one errors prevented it. Signed-off-by: Junio C Hamano