mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'mh/packed-ref-store-prep' into maint
Fix regression to "gitk --bisect" by a recent update. * mh/packed-ref-store-prep: rev-parse: don't trim bisect refnames
This commit is contained in:
commit
6b895039f4
|
@ -757,8 +757,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
|
|||
continue;
|
||||
}
|
||||
if (!strcmp(arg, "--bisect")) {
|
||||
for_each_ref_in("refs/bisect/bad", show_reference, NULL);
|
||||
for_each_ref_in("refs/bisect/good", anti_reference, NULL);
|
||||
for_each_fullref_in("refs/bisect/bad", show_reference, NULL, 0);
|
||||
for_each_fullref_in("refs/bisect/good", anti_reference, NULL, 0);
|
||||
continue;
|
||||
}
|
||||
if (opt_with_value(arg, "--branches", &arg)) {
|
||||
|
|
|
@ -236,17 +236,31 @@ test_sequence "--bisect"
|
|||
#
|
||||
#
|
||||
|
||||
test_expect_success '--bisect can default to good/bad refs' '
|
||||
test_expect_success 'set up fake --bisect refs' '
|
||||
git update-ref refs/bisect/bad c3 &&
|
||||
good=$(git rev-parse b1) &&
|
||||
git update-ref refs/bisect/good-$good $good &&
|
||||
good=$(git rev-parse c1) &&
|
||||
git update-ref refs/bisect/good-$good $good &&
|
||||
git update-ref refs/bisect/good-$good $good
|
||||
'
|
||||
|
||||
test_expect_success 'rev-list --bisect can default to good/bad refs' '
|
||||
# the only thing between c3 and c1 is c2
|
||||
git rev-parse c2 >expect &&
|
||||
git rev-list --bisect >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'rev-parse --bisect can default to good/bad refs' '
|
||||
git rev-parse c3 ^b1 ^c1 >expect &&
|
||||
git rev-parse --bisect >actual &&
|
||||
|
||||
# output order depends on the refnames, which in turn depends on
|
||||
# the exact sha1s. We just want to make sure we have the same set
|
||||
# of lines in any order.
|
||||
sort <expect >expect.sorted &&
|
||||
sort <actual >actual.sorted &&
|
||||
test_cmp expect.sorted actual.sorted
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue