diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-23 01:44:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-23 01:44:00 -0700 |
| commit | c9a88deede2e3438a70be7df233678d6a0fece74 (patch) | |
| tree | 2abe2481fb9d9e84cda22452d779b3dd7f8c4593 /t/t6040-tracking-info.sh | |
| parent | 44ee247f8db243fbd3c50fee0fe35696ed7da8d3 (diff) | |
| parent | 57ffc5f85a17416a718d4e7baf71d8356c9c7808 (diff) | |
| download | git-c9a88deede2e3438a70be7df233678d6a0fece74.tar.gz git-c9a88deede2e3438a70be7df233678d6a0fece74.tar.xz | |
Merge branch 'mg/track'
* mg/track:
Fix behavior with non-commit upstream references
Test tracking of non-commit upstreams
Diffstat (limited to 't/t6040-tracking-info.sh')
| -rwxr-xr-x | 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 3d6db4d38..00e1de962 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_success '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 |