From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 4 Jul 2018 23:56:36 +0000 (+0100)
Subject: test suite: checkout: Check we end up on the right branch each time
X-Git-Tag: archive/debian/5.7~5
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=244a7da76c07975d807da32de824ab3e3ee55478

test suite: checkout: Check we end up on the right branch each time

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

diff --git a/tests/tests/checkout b/tests/tests/checkout
index bc3d6ef4..756c49bd 100755
--- a/tests/tests/checkout
+++ b/tests/tests/checkout
@@ -5,6 +5,11 @@ t-tstunt-parsechangelog
 
 t-setup-import examplegit
 
+now-on () {
+	local branch=$(git symbolic-ref HEAD)
+	test "$branch" = "refs/heads/$1"
+}
+
 p=example
 
 mkdir $p.2
@@ -14,20 +19,25 @@ git init
 t-dgit setup-new-tree
 t-dgit checkout -p $p unstable
 
+now-on dgit/sid
 t-refs-same-start
 t-ref-head
 t-ref-same refs/tags/test-dummy/$v
 
 t-dgit checkout -p $p stable
+now-on dgit/stable
 
 t-dgit checkout -d no-such-distro sid
 t-ref-head
+now-on dgit/sid
 
 t-dgit checkout stable
+now-on dgit/stable
 
 git branch -D dgit/sid
 t-dgit checkout -d no-such-distro sid
 t-ref-head
+now-on dgit/sid
 
 git reflog --pretty=tformat:%gs >../reflog.got
 cat >../reflog.expect <<END