summaryrefslogtreecommitdiff
path: root/t/lib-rebase.sh
diff options
context:
space:
mode:
authorMartin von Zweigbergk <martinvonz@gmail.com>2013-06-07 06:11:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-07 16:41:11 (GMT)
commit5b5e1c7c7875bcaed7e640dd0d33de3dbe87e1bb (patch)
treeb5d9a3f141c55e6a534ed1a400f6a90159aafba3 /t/lib-rebase.sh
parent2aad7cace2253797fe0cd688e20f39ffb66db995 (diff)
downloadgit-5b5e1c7c7875bcaed7e640dd0d33de3dbe87e1bb.zip
git-5b5e1c7c7875bcaed7e640dd0d33de3dbe87e1bb.tar.gz
git-5b5e1c7c7875bcaed7e640dd0d33de3dbe87e1bb.tar.bz2
add tests for rebasing with patch-equivalence present
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.sh17
1 files changed, 17 insertions, 0 deletions
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index 1e0ff28..4b74ae4 100644
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -81,3 +81,20 @@ reset_rebase () {
git reset --hard &&
git clean -f
}
+
+cherry_pick () {
+ git cherry-pick -n "$2" &&
+ git commit -m "$1" &&
+ git tag "$1"
+}
+
+revert () {
+ git revert -n "$2" &&
+ git commit -m "$1" &&
+ git tag "$1"
+}
+
+make_empty () {
+ git commit --allow-empty -m "$1" &&
+ git tag "$1"
+}