git-rev-parse: parse ".." before simple SHA1's

diff --git a/read-cache.c b/read-cache.c
index 4b8348ca92b7ea9f955d890c417d05a6816f9ee0..9b6ce46b9fa57e85b5c9e6bf552dc27f40f6e5c5 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -190,7 +190,6 @@ static int has_file_name(const struct cache_entry *ce, int pos, int ok_to_replac
                        break;
                if (p->name[len] != '/')
                        continue;
-fprintf(stderr, "conflict: %s %s\n", ce->name, p->name);
                retval = -1;
                if (!ok_to_replace)
                        break;