summaryrefslogtreecommitdiff
path: root/.editorconfig
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2020-02-15 21:36:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-02-16 23:40:42 (GMT)
commit9a70f3d4ae673e02e78b1061fcc8fc01bc8d9276 (patch)
treeb5adf8fd061231cacc471cc1a5454dafd0635f0b /.editorconfig
parent93122c985a3671bd4e15b3dbc6b457c981eb8c23 (diff)
downloadgit-9a70f3d4ae673e02e78b1061fcc8fc01bc8d9276.zip
git-9a70f3d4ae673e02e78b1061fcc8fc01bc8d9276.tar.gz
git-9a70f3d4ae673e02e78b1061fcc8fc01bc8d9276.tar.bz2
t3432: make these tests work with either am or merge backends
t3432 had several stress tests for can_fast_forward(), whose intent was to ensure we were using the optimization of just fast forwarding when possible. However, these tests verified that fast forwards had happened based on the output that rebase printed to the terminal. We can instead test more directly that we actually fast-forwarded by checking the reflog, which also has the side effect of making the tests applicable for the merge/interactive backend. This change does lose the distinction between "noop" and "noop-force", but as stated in commit c9efc216830f ("t3432: test for --no-ff's interaction with fast-forward", 2019-08-27) which introduced that distinction: "These tests aren't supposed to endorse the status quo, just test for what we're currently doing.". This change does not actually run these tests with the merge/interactive backend; instead this is just a preparatory commit. A subsequent commit which fixes can_fast_forward() to work with that backend will then also change t3432 to add tests of that backend as well. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.editorconfig')
0 files changed, 0 insertions, 0 deletions