diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-11 23:19:54 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:34 -0700 |
| commit | 0b30e8125130a78bc7c0e13e7f45ba105bd206b8 (patch) | |
| tree | 9559f4cfcff140658d5e2489207344a99446ef21 /string-list.c | |
| parent | merge-recursive: Remember to free generated unique path names (diff) | |
| download | git-0b30e8125130a78bc7c0e13e7f45ba105bd206b8.tar.gz git-0b30e8125130a78bc7c0e13e7f45ba105bd206b8.zip | |
merge-recursive: Avoid working directory changes during recursive case
make_room_for_directories_of_df_conflicts() is about making sure necessary
working directory changes can succeed. When o->call_depth > 0 (i.e. the
recursive case), we do not want to make any working directory changes so
this function should be skipped.
Note that make_room_for_directories_of_df_conflicts() is broken as has
been pointed out by Junio; it should NOT be unlinking files. What it
should do is keep track of files that could be unlinked if a directory
later needs to be written in their place. However, that work also is only
relevant in the non-recursive case, so this change is helpful either way.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'string-list.c')
0 files changed, 0 insertions, 0 deletions