summaryrefslogtreecommitdiff
path: root/t/t7506-status-submodule.sh
diff options
context:
space:
mode:
authorLibravatar Derrick Stolee <stolee@gmail.com>2018-11-07 20:40:31 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-08 14:23:54 +0900
commit80cee6e3210120a8a45fc4818e0049f482247b0f (patch)
tree4ee78d79433a13358a90704610eaf740f11c64f6 /t/t7506-status-submodule.sh
parentt6036, t6043: increase code coverage for file collision handling (diff)
downloadtgif-80cee6e3210120a8a45fc4818e0049f482247b0f.tar.xz
merge-recursive: combine error handling
In handle_rename_rename_1to2(), we have duplicated error handling around colliding paths. Specifically, when we want to write out the file and there is a directory or untracked file in the way, we need to create a temporary file to hold the contents. This has some special output to alert the user, and this output is duplicated for each side of the conflict. Simplify the call by generating this new path in a helper function. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7506-status-submodule.sh')
0 files changed, 0 insertions, 0 deletions