зеркало из https://github.com/microsoft/git.git
Merge branch 'jk/pending-keep-tag-name' into maint
History traversal with "git log --source" that starts with an annotated tag failed to report the tag as "source", due to an old regression in the command line parser back in v2.2 days. * jk/pending-keep-tag-name: revision.c: propagate tag names from pending array
This commit is contained in:
Коммит
e3073cf895
|
@ -294,9 +294,8 @@ static struct commit *handle_commit(struct rev_info *revs,
|
||||||
/*
|
/*
|
||||||
* We'll handle the tagged object by looping or dropping
|
* We'll handle the tagged object by looping or dropping
|
||||||
* through to the non-tag handlers below. Do not
|
* through to the non-tag handlers below. Do not
|
||||||
* propagate data from the tag's pending entry.
|
* propagate path data from the tag's pending entry.
|
||||||
*/
|
*/
|
||||||
name = "";
|
|
||||||
path = NULL;
|
path = NULL;
|
||||||
mode = 0;
|
mode = 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -908,4 +908,33 @@ test_expect_success 'log diagnoses bogus HEAD' '
|
||||||
test_i18ngrep broken stderr
|
test_i18ngrep broken stderr
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'set up --source tests' '
|
||||||
|
git checkout --orphan source-a &&
|
||||||
|
test_commit one &&
|
||||||
|
test_commit two &&
|
||||||
|
git checkout -b source-b HEAD^ &&
|
||||||
|
test_commit three
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'log --source paints branch names' '
|
||||||
|
cat >expect <<-\EOF &&
|
||||||
|
09e12a9 source-b three
|
||||||
|
8e393e1 source-a two
|
||||||
|
1ac6c77 source-b one
|
||||||
|
EOF
|
||||||
|
git log --oneline --source source-a source-b >actual &&
|
||||||
|
test_cmp expect actual
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'log --source paints tag names' '
|
||||||
|
git tag -m tagged source-tag &&
|
||||||
|
cat >expect <<-\EOF &&
|
||||||
|
09e12a9 source-tag three
|
||||||
|
8e393e1 source-a two
|
||||||
|
1ac6c77 source-tag one
|
||||||
|
EOF
|
||||||
|
git log --oneline --source source-tag source-a >actual &&
|
||||||
|
test_cmp expect actual
|
||||||
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
Загрузка…
Ссылка в новой задаче