mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
19e8789b23
There's currently no robust way to tell Git that a particular option is meant to be a revision, and not an option. So if you have a branch "refs/heads/--foo", you cannot just say: git rev-list --foo You can say: git rev-list refs/heads/--foo But that breaks down if you don't know the refname, and in particular if you're a script passing along a value from elsewhere. In most programs, you can use "--" to end option parsing, like this: some-prog -- "$revision" But that doesn't work for the revision parser, because "--" is already meaningful there: it separates revisions from pathspecs. So we need some other marker to separate options from revisions. This patch introduces "--end-of-options", which serves that purpose: git rev-list --oneline --end-of-options "$revision" will work regardless of what's in "$revision" (well, if you say "--" it may fail, but it won't do something dangerous, like triggering an unexpected option). The name is verbose, but that's probably a good thing; this is meant to be used for scripted invocations where readability is more important than terseness. One alternative would be to introduce an explicit option to mark a revision, like: git rev-list --oneline --revision="$revision" That's slightly _more_ informative than this commit (because it makes even something silly like "--" unambiguous). But the pattern of using a separator like "--" is well established in git and in other commands, and it makes some scripting tasks simpler like: git rev-list --end-of-options "$@" There's no documentation in this patch, because it will make sense to describe the feature once it is available everywhere (and support will be added in further patches). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
151 lines
4.2 KiB
Bash
Executable file
151 lines
4.2 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='miscellaneous rev-list tests'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
echo content1 >wanted_file &&
|
|
echo content2 >unwanted_file &&
|
|
git add wanted_file unwanted_file &&
|
|
git commit -m one
|
|
'
|
|
|
|
test_expect_success 'rev-list --objects heeds pathspecs' '
|
|
git rev-list --objects HEAD -- wanted_file >output &&
|
|
grep wanted_file output &&
|
|
! grep unwanted_file output
|
|
'
|
|
|
|
test_expect_success 'rev-list --objects with pathspecs and deeper paths' '
|
|
mkdir foo &&
|
|
>foo/file &&
|
|
git add foo/file &&
|
|
git commit -m two &&
|
|
|
|
git rev-list --objects HEAD -- foo >output &&
|
|
grep foo/file output &&
|
|
|
|
git rev-list --objects HEAD -- foo/file >output &&
|
|
grep foo/file output &&
|
|
! grep unwanted_file output
|
|
'
|
|
|
|
test_expect_success 'rev-list --objects with pathspecs and copied files' '
|
|
git checkout --orphan junio-testcase &&
|
|
git rm -rf . &&
|
|
|
|
mkdir two &&
|
|
echo frotz >one &&
|
|
cp one two/three &&
|
|
git add one two/three &&
|
|
test_tick &&
|
|
git commit -m that &&
|
|
|
|
ONE=$(git rev-parse HEAD:one) &&
|
|
git rev-list --objects HEAD two >output &&
|
|
grep "$ONE two/three" output &&
|
|
! grep one output
|
|
'
|
|
|
|
test_expect_success 'rev-list --objects --no-object-names has no space/names' '
|
|
git rev-list --objects --no-object-names HEAD >output &&
|
|
! grep wanted_file output &&
|
|
! grep unwanted_file output &&
|
|
! grep " " output
|
|
'
|
|
|
|
test_expect_success 'rev-list --objects --no-object-names works with cat-file' '
|
|
git rev-list --objects --no-object-names --all >list-output &&
|
|
git cat-file --batch-check <list-output >cat-output &&
|
|
! grep missing cat-output
|
|
'
|
|
|
|
test_expect_success '--no-object-names and --object-names are last-one-wins' '
|
|
git rev-list --objects --no-object-names --object-names --all >output &&
|
|
grep wanted_file output &&
|
|
git rev-list --objects --object-names --no-object-names --all >output &&
|
|
! grep wanted_file output
|
|
'
|
|
|
|
test_expect_success 'rev-list A..B and rev-list ^A B are the same' '
|
|
git commit --allow-empty -m another &&
|
|
git tag -a -m "annotated" v1.0 &&
|
|
git rev-list --objects ^v1.0^ v1.0 >expect &&
|
|
git rev-list --objects v1.0^..v1.0 >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'propagate uninteresting flag down correctly' '
|
|
git rev-list --objects ^HEAD^{tree} HEAD^{tree} >actual &&
|
|
test_must_be_empty actual
|
|
'
|
|
|
|
test_expect_success 'symleft flag bit is propagated down from tag' '
|
|
git log --format="%m %s" --left-right v1.0...master >actual &&
|
|
cat >expect <<-\EOF &&
|
|
> two
|
|
> one
|
|
< another
|
|
< that
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'rev-list can show index objects' '
|
|
# Of the blobs and trees in the index, note:
|
|
#
|
|
# - we do not show two/three, because it is the
|
|
# same blob as "one", and we show objects only once
|
|
#
|
|
# - we do show the tree "two", because it has a valid cache tree
|
|
# from the last commit
|
|
#
|
|
# - we do not show the root tree; since we updated the index, it
|
|
# does not have a valid cache tree
|
|
#
|
|
cat >expect <<-\EOF &&
|
|
8e4020bb5a8d8c873b25de15933e75cc0fc275df one
|
|
d9d3a7417b9605cfd88ee6306b28dadc29e6ab08 only-in-index
|
|
9200b628cf9dc883a85a7abc8d6e6730baee589c two
|
|
EOF
|
|
echo only-in-index >only-in-index &&
|
|
test_when_finished "git reset --hard" &&
|
|
git add only-in-index &&
|
|
git rev-list --objects --indexed-objects >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'rev-list can negate index objects' '
|
|
git rev-parse HEAD >expect &&
|
|
git rev-list -1 --objects HEAD --not --indexed-objects >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '--bisect and --first-parent can not be combined' '
|
|
test_must_fail git rev-list --bisect --first-parent HEAD
|
|
'
|
|
|
|
test_expect_success '--header shows a NUL after each commit' '
|
|
# We know that there is no Q in the true payload; names and
|
|
# addresses of the authors and the committers do not have
|
|
# any, and object names or header names do not, either.
|
|
git rev-list --header --max-count=2 HEAD |
|
|
nul_to_q |
|
|
grep "^Q" >actual &&
|
|
cat >expect <<-EOF &&
|
|
Q$(git rev-parse HEAD~1)
|
|
Q
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'rev-list --end-of-options' '
|
|
git update-ref refs/heads/--output=yikes HEAD &&
|
|
git rev-list --end-of-options --output=yikes >actual &&
|
|
test_path_is_missing yikes &&
|
|
git rev-list HEAD >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|