summaryrefslogtreecommitdiff
path: root/t/lib-rebase.sh
diff options
context:
space:
mode:
authorMartin von Zweigbergk <martinvonz@gmail.com>2013-06-06 23:11:37 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-07 09:40:14 -0700
commit2aad7cace2253797fe0cd688e20f39ffb66db995 (patch)
treedcf6e7213e2446c639834d91f02135072037a59d /t/lib-rebase.sh
parentedca4152560522a431a51fc0a06147fc680b5b18 (diff)
downloadgit-2aad7cace2253797fe0cd688e20f39ffb66db995.tar.gz
add simple tests of consistency across rebase types
Helped-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-rebase.sh')
-rw-r--r--t/lib-rebase.sh16
1 files changed, 16 insertions, 0 deletions
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
+}