diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-17 22:22:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-17 22:22:06 -0700 |
| commit | b9b3eef76186d423efb684d01b3e99ef010a61de (patch) | |
| tree | f839064d11cf5af7b0839ccbabee3bd645747904 /t/t5502-quickfetch.sh | |
| parent | merge-recursive: When we detect we can skip an update, actually skip it (diff) | |
| download | tgif-b9b3eef76186d423efb684d01b3e99ef010a61de.tar.xz | |
merge-recursive: tweak magic band-aid
Running checks against working tree (e.g. lstat()) and causing
changes to working tree (e.g. unlink()) while building a virtual
ancestor merge does not make any sense. Avoid doing so.
This is not a real fix; it is another magic band-aid on top of
another band-aid we placed earlier.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5502-quickfetch.sh')
0 files changed, 0 insertions, 0 deletions