summaryrefslogtreecommitdiff
path: root/t/t4252/am-test-5-2
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2019-03-22 16:31:35 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-03-24 21:35:34 +0900
commit191e9d2c2dac2aaf8cb7db854cec48028addfece (patch)
treee4f5d3c30a8cbfe4feefa571f386787d666fd1e9 /t/t4252/am-test-5-2
parentThe third batch (diff)
downloadtgif-191e9d2c2dac2aaf8cb7db854cec48028addfece.tar.xz
unpack-trees: keep gently check inside add_rejected_path
This basically follows the footsteps of 6a143aa2b2 (checkout -m: attempt merge when deletion of path was staged - 2014-08-12) where there gently check is moved inside reject_merge() so that callers do not accidentally forget it. add_rejected_path() has the same usage pattern. All call sites check gently first, then decide to call add_rejected_path() if needed. Move the check inside. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4252/am-test-5-2')
0 files changed, 0 insertions, 0 deletions