git-debrebase: merge: New record-resolved-merge subcommand, WIP

[dgit.git] / tests / tests / checkout

diff --git a/tests/tests/checkout b/tests/tests/checkout
index bc3d6ef468328d640cbb3842ae19410e071af2a2..756c49bddc2b465f246b0b5d2b374f21634f7d6e 100755 (executable)
--- 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