diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-08-06 01:37:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-08-06 01:37:10 -0700 |
| commit | a6954452ecf757523b31d6eaaf7e00c7a2d91e46 (patch) | |
| tree | 83019fdce5742e2c84ca2278835e8da1b629fe33 /builtin-apply.c | |
| parent | a76c2acb28146f5630592f2ba738c0ebf0f3c1c4 (diff) | |
| parent | 93969438dca50c7f0039fcf35e7ab82776d4122f (diff) | |
| download | git-a6954452ecf757523b31d6eaaf7e00c7a2d91e46.tar.gz git-a6954452ecf757523b31d6eaaf7e00c7a2d91e46.tar.xz | |
Merge branch 'maint'
* maint:
apply: remove directory that becomes empty by renaming the last file away
setup.c:verify_non_filename(): don't die unnecessarily while disambiguating
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 0a0b4a9e3..da270755a 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -2508,7 +2508,7 @@ static void write_out_one_result(struct patch *patch, int phase) * thing: remove the old, write the new */ if (phase == 0) - remove_file(patch, 0); + remove_file(patch, patch->is_rename); if (phase == 1) create_file(patch); } |