mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
show-ref: detect dangling refs under --verify as well
Move detection of dangling refs into show_one(), so that they are detected when --verify is present as well as when it is absent. Signed-off-by: Vladimir Panteleev <git@thecybershadow.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
14144d3b53
commit
d01b8203ec
|
@ -22,6 +22,14 @@ static void show_one(const char *refname, const struct object_id *oid)
|
||||||
const char *hex;
|
const char *hex;
|
||||||
struct object_id peeled;
|
struct object_id peeled;
|
||||||
|
|
||||||
|
/* This changes the semantics slightly that even under quiet we
|
||||||
|
* detect and return error if the repository is corrupt and
|
||||||
|
* ref points at a nonexistent object.
|
||||||
|
*/
|
||||||
|
if (!has_sha1_file(oid->hash))
|
||||||
|
die("git show-ref: bad ref %s (%s)", refname,
|
||||||
|
oid_to_hex(oid));
|
||||||
|
|
||||||
if (quiet)
|
if (quiet)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -77,14 +85,6 @@ static int show_ref(const char *refname, const struct object_id *oid,
|
||||||
match:
|
match:
|
||||||
found_match++;
|
found_match++;
|
||||||
|
|
||||||
/* This changes the semantics slightly that even under quiet we
|
|
||||||
* detect and return error if the repository is corrupt and
|
|
||||||
* ref points at a nonexistent object.
|
|
||||||
*/
|
|
||||||
if (!has_sha1_file(oid->hash))
|
|
||||||
die("git show-ref: bad ref %s (%s)", refname,
|
|
||||||
oid_to_hex(oid));
|
|
||||||
|
|
||||||
show_one(refname, oid);
|
show_one(refname, oid);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -184,4 +184,26 @@ test_expect_success 'show-ref --verify HEAD' '
|
||||||
test_cmp expect actual
|
test_cmp expect actual
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'show-ref --verify with dangling ref' '
|
||||||
|
sha1_file() {
|
||||||
|
echo "$*" | sed "s#..#.git/objects/&/#"
|
||||||
|
} &&
|
||||||
|
|
||||||
|
remove_object() {
|
||||||
|
file=$(sha1_file "$*") &&
|
||||||
|
test -e "$file" &&
|
||||||
|
rm -f "$file"
|
||||||
|
} &&
|
||||||
|
|
||||||
|
test_when_finished "rm -rf dangling" &&
|
||||||
|
(
|
||||||
|
git init dangling &&
|
||||||
|
cd dangling &&
|
||||||
|
test_commit dangling &&
|
||||||
|
sha=$(git rev-parse refs/tags/dangling) &&
|
||||||
|
remove_object $sha &&
|
||||||
|
test_must_fail git show-ref --verify refs/tags/dangling
|
||||||
|
)
|
||||||
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
Loading…
Reference in a new issue