diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-03-22 12:31:35 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-24 15:35:34 +0300 |
| commit | 191e9d2c2dac2aaf8cb7db854cec48028addfece (patch) | |
| tree | e4f5d3c30a8cbfe4feefa571f386787d666fd1e9 /unpack-trees.h | |
| parent | 041f5ea1cf987a4068ef5f39ba0a09be85952064 (diff) | |
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 'unpack-trees.h')
0 files changed, 0 insertions, 0 deletions