summaryrefslogtreecommitdiff
path: root/t/t2010-checkout-ambiguous.sh
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-12-11 08:11:34 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-12-28 12:49:48 -0800
commit5400677903bdb852e0ca89e41e009afb8a1b6239 (patch)
tree44bf20644f96d6270b6bf443202bc19b989cece3 /t/t2010-checkout-ambiguous.sh
parentrebase: fix incompatible options error message (diff)
downloadtgif-5400677903bdb852e0ca89e41e009afb8a1b6239.tar.xz
t5407: add a test demonstrating how interactive handles --skip differently
The post-rewrite hook is documented as being invoked by commands that rewrite commits such as commit --amend and rebase, and that it will be called for each rewritten commit. Apparently, the three backends handled --skip'ed commits differently: am: treat the skipped commit as though it weren't rewritten merge: same as 'am' backend interactive: treat skipped commits as having been rewritten to empty (view them as an empty fixup to their parent) For now, just add a testcase documenting the different behavior (use --keep to force usage of the interactive machinery even though we have no empty commits). A subsequent commit will remove the inconsistency in --skip handling. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2010-checkout-ambiguous.sh')
0 files changed, 0 insertions, 0 deletions