summaryrefslogtreecommitdiff
path: root/contrib/emacs
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-07-16 23:28:23 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-07-16 23:28:36 -0700
commitc28c571c143a5145665f4bf334671ac3a7d0980c (patch)
tree713d684ddc39cc577b222449a1b340cfd2c5bec4 /contrib/emacs
parenttypechange tests for git apply (currently failing) (diff)
downloadtgif-c28c571c143a5145665f4bf334671ac3a7d0980c.tar.xz
apply: check D/F conflicts more carefully.
When creating a new file where a directory used to be (or the user had an empty directory) the code did not check the result from lstat() closely enough, and mistakenly thought the path already existed in the working tree. This does not fix the problem where you have a patch that creates a file at "foo" and removes a file at "foo/bar" (which presumably is the last file in "foo/" directory in the original). For that, we would need to restructure write_out_results() loop. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'contrib/emacs')
0 files changed, 0 insertions, 0 deletions