summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2019-08-25 05:12:02 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-08-26 12:34:56 -0700
commit4336d365123e45be0ed4a7286df54ccce560d55f (patch)
tree28ab3e83c5e2358f66e249e8726e71a565076b50 /xdiff-interface.c
parentt3432: test rebase fast-forward behavior (diff)
downloadtgif-4336d365123e45be0ed4a7286df54ccce560d55f.tar.xz
t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests
Change "same head" introduced in the preceding commit to check whether the rebase.c code lands in the can_fast_forward() case in, and thus prints out an "is up to date" and aborts early. In some of these cases we make it past that and to "rewinding head", then do a rebase, only to find out there's nothing to change so HEAD stays at the same OID. These tests presumed these two cases were the same thing. In terms of where HEAD ends up they are, but we're not only interested in rebase semantics, but also whether or not we're needlessly doing work when we could avoid it entirely. I'm adding "same" and "diff" here because I'll follow-up and add --no-ff tests, where some of those will be "diff"-erent, so add the "diff" code already. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions