diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-05-04 10:45:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-05-04 10:45:36 -0700 |
| commit | 8a9d32b7e9f3aebd9c322c4613c4608224d09a60 (patch) | |
| tree | d952b69c7ba71b0f5628166bfcc81abb67ed818f /read-cache.c | |
| parent | Optimize diff-cache -p --cached (diff) | |
| download | tgif-8a9d32b7e9f3aebd9c322c4613c4608224d09a60.tar.xz | |
When the patch tries to create a new file and the file exists, abort.
This fixes an error introduced to git-apply-patch-script in the previous
round. We do not invoke patch for create/delete case, so we need to
be a bit careful about detecting conflicts like this.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'read-cache.c')
0 files changed, 0 insertions, 0 deletions