diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-04-19 10:58:02 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-04-20 10:44:15 +0900 |
| commit | 3992ff0c4caf925373b61aa17ab507207bf7e645 (patch) | |
| tree | e222daab27eb19b7b82e89ea72e440652ff34f23 /t/t5311-pack-bitmaps-shallow.sh | |
| parent | merge-recursive: fix leaks of allocated renames and diff_filepairs (diff) | |
| download | tgif-3992ff0c4caf925373b61aa17ab507207bf7e645.tar.xz | |
merge-recursive: make !o->detect_rename codepath more obvious
Previously, if !o->detect_rename then get_renames() would return an
empty string_list, and then process_renames() would have nothing to
iterate over. It seems more straightforward to simply avoid calling
either function in that case.
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5311-pack-bitmaps-shallow.sh')
0 files changed, 0 insertions, 0 deletions