From 2aad7cace2253797fe0cd688e20f39ffb66db995 Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Thu, 6 Jun 2013 23:11:37 -0700 Subject: add simple tests of consistency across rebase types Helped-by: Johannes Sixt Signed-off-by: Martin von Zweigbergk Signed-off-by: Junio C Hamano --- t/lib-rebase.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 't/lib-rebase.sh') diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index 6ccf797091..1e0ff285a6 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@ -65,3 +65,19 @@ EOF test_set_editor "$(pwd)/fake-editor.sh" chmod a+x fake-editor.sh } + +# checks that the revisions in "$2" represent a linear range with the +# subjects in "$1" +test_linear_range () { + revlist_merges=$(git rev-list --merges "$2") && + test -z "$revlist_merges" && + expected=$1 + set -- $(git log --reverse --format=%s "$2") + test "$expected" = "$*" +} + +reset_rebase () { + test_might_fail git rebase --abort && + git reset --hard && + git clean -f +} -- cgit v1.2.3