mirror of
https://github.com/git/git.git
synced 2024-11-16 14:04:52 +01:00
b09fe971de
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>
195 lines
4.1 KiB
Bash
Executable file
195 lines
4.1 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='rev-list/rev-parse --glob'
|
|
|
|
. ./test-lib.sh
|
|
|
|
commit () {
|
|
test_tick &&
|
|
echo $1 > foo &&
|
|
git add foo &&
|
|
git commit -m "$1"
|
|
}
|
|
|
|
compare () {
|
|
# Split arguments on whitespace.
|
|
git $1 $2 >expected &&
|
|
git $1 $3 >actual &&
|
|
test_cmp expected actual
|
|
}
|
|
|
|
test_expect_success 'setup' '
|
|
|
|
commit master &&
|
|
git checkout -b subspace/one master &&
|
|
commit one &&
|
|
git checkout -b subspace/two master &&
|
|
commit two &&
|
|
git checkout -b subspace-x master &&
|
|
commit subspace-x &&
|
|
git checkout -b other/three master &&
|
|
commit three &&
|
|
git checkout -b someref master &&
|
|
commit some &&
|
|
git checkout master &&
|
|
commit master2 &&
|
|
git tag foo/bar master &&
|
|
git update-ref refs/remotes/foo/baz master
|
|
'
|
|
|
|
test_expect_success 'rev-parse --glob=refs/heads/subspace/*' '
|
|
|
|
compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
|
|
|
|
'
|
|
|
|
test_expect_success 'rev-parse --glob=heads/subspace/*' '
|
|
|
|
compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/*"
|
|
|
|
'
|
|
|
|
test_expect_success 'rev-parse --glob=refs/heads/subspace/' '
|
|
|
|
compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/"
|
|
|
|
'
|
|
|
|
test_expect_success 'rev-parse --glob=heads/subspace/' '
|
|
|
|
compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/"
|
|
|
|
'
|
|
|
|
test_expect_success 'rev-parse --glob=heads/subspace' '
|
|
|
|
compare rev-parse "subspace/one subspace/two" "--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/*"
|
|
|
|
'
|
|
|
|
test_expect_success 'rev-parse --glob=heads/someref/* master' '
|
|
|
|
compare rev-parse "master" "--glob=heads/someref/* master"
|
|
|
|
'
|
|
|
|
test_expect_success 'rev-parse --glob=heads/*' '
|
|
|
|
compare rev-parse "master other/three someref subspace-x subspace/one subspace/two" "--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/*"
|
|
|
|
'
|
|
|
|
test_expect_success 'rev-list --glob=heads/subspace/*' '
|
|
|
|
compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/*"
|
|
|
|
'
|
|
|
|
test_expect_success 'rev-list --glob=refs/heads/subspace/' '
|
|
|
|
compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/"
|
|
|
|
'
|
|
|
|
test_expect_success 'rev-list --glob=heads/subspace/' '
|
|
|
|
compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/"
|
|
|
|
'
|
|
|
|
test_expect_success 'rev-list --glob=heads/subspace' '
|
|
|
|
compare rev-list "subspace/one subspace/two" "--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"
|
|
|
|
'
|
|
|
|
test_expect_success 'rev-list --glob=heads/subspace/* --glob=heads/other/*' '
|
|
|
|
compare rev-list "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
|
|
|
|
'
|
|
|
|
test_expect_success 'rev-list --glob=heads/*' '
|
|
|
|
compare rev-list "master other/three someref subspace-x subspace/one subspace/two" "--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
|