From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 19 Aug 2010 22:49:24 +0000 (-0700)
Subject: Merge branch 'jc/sha1-name-find-fix' into maint
X-Git-Tag: v1.7.2.2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6baa9bd882fe003478c42ee5709dcfc713e13ec9;p=git.git

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
---

6baa9bd882fe003478c42ee5709dcfc713e13ec9
diff --cc sha1_name.c
index 4f2af8da9,8a551025f..4af94fa59
--- a/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);
  }
  
+ /*
+  * This interprets names like ':/Initial revision of "git"' by searching
+  * through history and returning the first commit whose message starts
 - * with the given string.
++ * 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)
  {