diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-07-17 00:10:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-17 00:10:47 -0700 |
| commit | 7f95aef28fa1e2662aebb4556c71ad6912d395e5 (patch) | |
| tree | 57fbcb9b99c40bdf75742df2e21637294998921c /merge-file.c | |
| parent | apply: split out removal and creation into different phases. (diff) | |
| download | tgif-7f95aef28fa1e2662aebb4556c71ad6912d395e5.tar.xz | |
apply: handle type-changing patch correctly.
A type-change diff is always split into a patch to delete old,
immediately followed by a patch to create new. check_patch()
routine noticed that the path to be created already exists in
the working tree and/or in the index when looking at the
creation patch and mistakenly thought it to be an error.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions