Thread (97 messages) 97 messages, 6 authors, 2021-02-06

Re: [PATCH v4 7/9] t3437: test script for fixup [-C|-c] options in interactive rebase

flat view

From: Charvi Mendiratta <hidden>
Date: 2021-02-04 19:14:03

Hi Eric,
quoted
+test_expect_success 'fixup -C with conflicts gives correct message' '
+       test_when_finished "test_might_fail git rebase --abort" &&
Is there a reason this isn't written as:

    test_when_finished "reset_rebase" &&

which is more common? Is there something non-obvious which makes
reset_rebase() inappropriate in these tests?
I missed this earlier, but I confirmed before sending next version that as
reset_rebase() removes the untracked files so we could not use this as otherwise
it removes the fake-editor.sh file and will be required to set a fake
editor for every
test and also removes other untracked files which may be used to debug.
So, I think it's okay with:
test_when_finished "test_might_fail git rebase --abort"

Thanks and regards,
Charvi
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help