Merge branch 'jc/sha1-name-find-fix' into maint

* jc/sha1-name-find-fix:
  sha1_name.c: fix parsing of ":/token" syntax

Conflicts:
	sha1_name.c

diff --cc sha1_name.c
index 4f2af8da934b125f2c09ceb4d8185dabc58f7831,8a551025f0f4a1f02f60b1611d412ae0e125dbb7..4af94fa59806c570c177a68139b54d46772d68a5
--- 1/sha1_name.c
--- 2/sha1_name.c
+++ b/sha1_name.c
@@@ -659,6 -659,16 +659,16 @@@ static int get_sha1_1(const char *name
        return get_short_sha1(name, len, sha1, 0);
  }
  
 - * with the given string.
+ /*
+  * This interprets names like ':/Initial revision of "git"' by searching
+  * through history and returning the first commit whose message starts
++ * the given regular expression.
+  *
+  * For future extension, ':/!' is reserved. If you want to match a message
+  * beginning with a '!', you have to repeat the exclamation mark.
+  */
+ #define ONELINE_SEEN (1u<<20)
+ 
  static int handle_one_ref(const char *path,
                const unsigned char *sha1, int flag, void *cb_data)
  {