[PATCH 1/2] Test tracking of non-commit upstreams

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Michael J Gruber
Date: Monday, May 11, 2009 - 7:42 am

git-checkout and git-branch allow setting up an arbitrary committish as
the upstream reference for --track. In particular, tags are allowed. But
they and git-status barf on non-commit upstreams as soon as they are
asked for trackings stats.

Expose this shortcoming by adding two tests: annotated tags are affected
but lightweight tags are OK.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
 t/t6040-tracking-info.sh |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index 3d6db4d..2397774 100755
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -74,5 +74,19 @@ test_expect_success 'status' '
 	grep "have 1 and 1 different" actual
 '
 
+test_expect_success 'status when tracking lightweight tags' '
+	git checkout master &&
+	git tag light && 
+	git branch --track lighttrack light >actual &&
+	grep "set up to track" actual &&
+	git checkout lighttrack
+'
 
+test_expect_failure 'status when tracking annotated tags' '
+	git checkout master &&
+	git tag -m heavy heavy && 
+	git branch --track heavytrack heavy >actual &&
+	grep "set up to track" actual &&
+	git checkout heavytrack
+'
 test_done
-- 
1.6.3.195.gad816

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 0/2] Allow tags as upstreams for --track, Michael J Gruber, (Mon May 11, 7:42 am)
[PATCH 1/2] Test tracking of non-commit upstreams, Michael J Gruber, (Mon May 11, 7:42 am)
Re: [PATCH 2/2] Fix behavior with non-committish upstream ..., Michael J Gruber, (Thu May 14, 12:51 am)