Now the test "no changes are a nop" checks additionally,
that HEAD is commit I and a symbolic ref for branch2.
The new test fails on a situation like this, for example:
$ git branch -v
* (no branch) cac536e I
branch1 1599c04 H
branch2 cac536e I
master cb54291 E
Signed-off-by: Stephan Beyer <s-beyer@xxxxxxx>
---
t/t3404-rebase-interactive.sh | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index b9e3dbd..623d784 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -96,7 +96,9 @@ chmod a+x fake-editor.sh
test_expect_success 'no changes are a nop' '
git rebase -i F &&
- test $(git rev-parse I) = $(git rev-parse HEAD)
+ test $(git rev-parse I) = $(git rev-parse HEAD) &&
+ test $(git rev-parse I) = $(git rev-parse branch2) &&
+ git symbolic-ref HEAD
'
test_expect_success 'test the [branch] option' '
--
1.5.5.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html