diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-02 21:40:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-02 21:40:51 -0700 |
| commit | 99a19b43021024e12ddb67831f8e5919f86a5979 (patch) | |
| tree | d2dee021c90705a5a6f0f13593c6673469df7377 /git-merge-resolve.sh | |
| parent | c807f771947de65dceb22960d1a093d702f42105 (diff) | |
| download | git-99a19b43021024e12ddb67831f8e5919f86a5979.tar.gz git-99a19b43021024e12ddb67831f8e5919f86a5979.tar.xz | |
Make sure get_sha1 does not accept ambiguous sha1 prefix.
The original code did not even check alternates, and was confused if
an unpacked object was uniquely found when there was another object
that shares the same prefix in the pack.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions