summaryrefslogtreecommitdiff
path: root/sha1_name.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-09-07 18:16:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-09-15 23:52:43 (GMT)
commit6099835c1900876c813be6114ff4e81f6d90e8a3 (patch)
tree3ecfdf5de8bf11f8d6abffd91eb4aa2018397ee8 /sha1_name.c
parentf696543dad6c7ba27b0c4fab167a5687263a9ba0 (diff)
downloadgit-6099835c1900876c813be6114ff4e81f6d90e8a3.zip
git-6099835c1900876c813be6114ff4e81f6d90e8a3.tar.gz
git-6099835c1900876c813be6114ff4e81f6d90e8a3.tar.bz2
Allow git merge ":/<pattern>"
It probably is not such a good idea to use ":/<pattern>" to specify which commit to merge, as ":/<pattern>" can often hit unexpected commits, but somebody tried it and got a nonsense error message: fatal: ':/Foo bar' does not point to a commit So here is a for-the-sake-of-consistency update that is fairly useless that allows users to carefully try not shooting in the foot. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_name.c')
-rw-r--r--sha1_name.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/sha1_name.c b/sha1_name.c
index ff5992a..653b065 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -501,12 +501,6 @@ struct object *peel_to_type(const char *name, int namelen,
{
if (name && !namelen)
namelen = strlen(name);
- if (!o) {
- unsigned char sha1[20];
- if (get_sha1_1(name, namelen, sha1))
- return NULL;
- o = parse_object(sha1);
- }
while (1) {
if (!o || (!o->parsed && !parse_object(o->sha1)))
return NULL;