diff options
author | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | 2010-01-20 11:48:26 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 12:30:25 -0800 |
commit | b09fe971dea73ff6f5296ce533a566114b23ca4e (patch) | |
tree | 69b2da8e23b89af69575aa4de550479dc87652ff /t | |
parent | rev-parse --glob (diff) | |
download | tgif-b09fe971dea73ff6f5296ce533a566114b23ca4e.tar.xz |
rev-parse --branches/--tags/--remotes=pattern
Since local branch, tags and remote tracking branch namespaces are
most often used, add shortcut notations for globbing those in
manner similar to --glob option.
With this, one can express the "what I have but origin doesn't?"
as:
'git log --branches --not --remotes=origin'
Original-idea-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-x | t/t6018-rev-list-glob.sh | 63 |
1 files changed, 62 insertions, 1 deletions
diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh index 1f251e1f43..8d3fa7d014 100755 --- a/t/t6018-rev-list-glob.sh +++ b/t/t6018-rev-list-glob.sh @@ -32,7 +32,9 @@ test_expect_success 'setup' ' git checkout -b someref master && commit some && git checkout master && - commit master2 + commit master2 && + git tag foo/bar master && + git update-ref refs/remotes/foo/baz master ' test_expect_success 'rev-parse --glob=refs/heads/subspace/*' ' @@ -65,6 +67,24 @@ test_expect_success 'rev-parse --glob=heads/subspace' ' ' +test_expect_success 'rev-parse --branches=subspace/*' ' + + compare rev-parse "subspace/one subspace/two" "--branches=subspace/*" + +' + +test_expect_success 'rev-parse --branches=subspace/' ' + + compare rev-parse "subspace/one subspace/two" "--branches=subspace/" + +' + +test_expect_success 'rev-parse --branches=subspace' ' + + compare rev-parse "subspace/one subspace/two" "--branches=subspace" + +' + test_expect_success 'rev-parse --glob=heads/subspace/* --glob=heads/other/*' ' compare rev-parse "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*" @@ -83,6 +103,18 @@ test_expect_success 'rev-parse --glob=heads/*' ' ' +test_expect_success 'rev-parse --tags=foo' ' + + compare rev-parse "foo/bar" "--tags=foo" + +' + +test_expect_success 'rev-parse --remotes=foo' ' + + compare rev-parse "foo/baz" "--remotes=foo" + +' + test_expect_success 'rev-list --glob=refs/heads/subspace/*' ' compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/*" @@ -113,6 +145,23 @@ test_expect_success 'rev-list --glob=heads/subspace' ' ' +test_expect_success 'rev-list --branches=subspace/*' ' + + compare rev-list "subspace/one subspace/two" "--branches=subspace/*" + +' + +test_expect_success 'rev-list --branches=subspace/' ' + + compare rev-list "subspace/one subspace/two" "--branches=subspace/" + +' + +test_expect_success 'rev-list --branches=subspace' ' + + compare rev-list "subspace/one subspace/two" "--branches=subspace" + +' test_expect_success 'rev-list --glob=heads/someref/* master' ' compare rev-list "master" "--glob=heads/someref/* master" @@ -131,4 +180,16 @@ test_expect_success 'rev-list --glob=heads/*' ' ' +test_expect_success 'rev-list --tags=foo' ' + + compare rev-list "foo/bar" "--tags=foo" + +' + +test_expect_success 'rev-list --remotes=foo' ' + + compare rev-list "foo/baz" "--remotes=foo" + +' + test_done |