From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 15:46:04 +0000 (+0100)
Subject: git-debrebase: merge: test: Drop stuff cloned from gdr-viagit
X-Git-Tag: archive/debian/6.7~106
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=79c61ce4926d8bb167fcdc5dd494c667ed4e9fbd

git-debrebase: merge: test: Drop stuff cloned from gdr-viagit

We don't much are about this here.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index 07ded5a3..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