X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge;h=b1a215a4890e8241e67693c8a018a10592974729;hb=79c61ce4926d8bb167fcdc5dd494c667ed4e9fbd;hp=a213385a06de5e44af7a492fbf361d2402bf97fb;hpb=75da546e42b202e22aafb7241b9819e51b1d6ea7;p=dgit.git

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index a213385a..b1a215a4 100755
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -8,25 +8,6 @@ t-dependencies NO-DGIT GDR
 t-tstunt-parsechangelog
 t-setup-import gdr-convert-gbp-noarchive
 
-: 'set up so t-git-debrebase runs gdr via git'
-
-case "$DGIT_GITDEBREBASE_TEST" in
-''|git-debrebase)	;;
-*)
-	t-tstunt
-	st=$tmp/tstunt/git-debrebase
-	export DGIT_GITDEBREBASE_TEST_REAL="$DGIT_GITDEBREBASE_TEST"
-	cat <<'END' >$st
-#!/bin/sh
-set -x
-exec "$DGIT_GITDEBREBASE_TEST_REAL" "$@"
-END
-	chmod +x $st
-	;;
-esac
-
-DGIT_GITDEBREBASE_TEST='git debrebase'
-
 : 'do a simple test'
 
 cd $p
@@ -66,8 +47,12 @@ export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
 
 t-git-debrebase
 t-gdr-good laundered
+
+t-refs-same-start
+t-ref-head
 t-git-debrebase
-t-gdr-good laundered
+t-ref-head
+
 t-git-debrebase scrap
 
 t-some-changes after