Skip to content

Commit

Permalink
Revert "get_sha1_basic(): corner case ambiguity fix"
Browse files Browse the repository at this point in the history
This reverts 6677c46 commit.

The misguided disambiguation has been reverted, so there is no point
testing that misfeature.
  • Loading branch information
Junio C Hamano committed Dec 18, 2005
1 parent f7087e2 commit c054d64
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 49 deletions.
2 changes: 1 addition & 1 deletion sha1_name.c
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ static int ambiguous_path(const char *path, int len)
slash = 0;
continue;
}
return slash;
break;
}
return slash;
}
Expand Down
48 changes: 0 additions & 48 deletions t/t0000-basic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -205,52 +205,4 @@ test_expect_success \
'no diff after checkout and git-update-index --refresh.' \
'git-diff-files >current && cmp -s current /dev/null'


# extended sha1 parsing and ambiguity resolution

GIT_AUTHOR_DATE='1995-01-29T16:00:00 -0800'
GIT_AUTHOR_EMAIL=a.u.thor@example.com
GIT_AUTHOR_NAME='A U Thor'
GIT_COMMITTER_DATE='1995-01-29T16:00:00 -0800'
GIT_COMMITTER_EMAIL=c.o.mmitter@example.com
GIT_COMMITTER_NAME='C O Mmitter'
export GIT_AUTHOR_DATE
export GIT_AUTHOR_EMAIL
export GIT_AUTHOR_NAME
export GIT_COMMITTER_DATE
export GIT_COMMITTER_EMAIL
export GIT_COMMITTER_NAME

test_expect_success \
'initial commit.' \
'commit=$(echo Initial commit | git-commit-tree $tree) &&
echo "$commit" >.git/refs/heads/master &&
git-ls-tree HEAD &&
test "$commit" = 51a092e9ef6cbbe66d258acd17599d3f80be6162'

test_expect_success \
'Ambiguous' \
'echo "$commit" >.git/refs/heads/nasty &&
echo "$commit" >.git/refs/tags/nasty &&
if git-rev-parse --verify nasty
then
echo "should have barfed"
false
else
:
fi &&
# names directly underneath .git/ should not interfere
echo "$commit" >.git/refs/heads/description &&
git-rev-parse --verify description &&
# broken object name
echo fffffffffffffffffffffffffffffffffffffffg \
>.git/refs/heads/nasty &&
if git-rev-parse --verify nasty
then
echo "should have barfed"
false
else
:
fi'

test_done

0 comments on commit c054d64

Please sign in to comment.