Change 'master@noon' syntax to 'master@{noon}'.

Its ambiguous to parse "master@2006-05-17 18:30:foo" when foo is
meant as a file name and ":30" is meant as 30 minutes past 6 pm.
Therefore all date specifications in a sha1 expression must now
appear within brackets and the ':' splitter used for the path name
in a sha1 expression ignores ':' appearing within brackets.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

1 files changed, 39 insertions, 16 deletions

diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index 7858d86b9..f6b076baf 100755
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -125,52 +125,75 @@ ed="Thu, 26 May 2005 18:32:00 -0500"
 gd="Thu, 26 May 2005 18:33:00 -0500"
 ld="Thu, 26 May 2005 18:43:00 -0500"
 test_expect_success \
-	'Query "master@May 25 2005" (before history)' \
+	'Query "master@{May 25 2005}" (before history)' \
 	'rm -f o e
-	 git-rev-parse --verify "master@May 25 2005" >o 2>e &&
+	 git-rev-parse --verify "master@{May 25 2005}" >o 2>e &&
 	 test $C = $(cat o) &&
 	 test "warning: Log .git/logs/$m only goes back to $ed." = "$(cat e)"'
 test_expect_success \
-	"Query master@2005-05-25 (before history)" \
+	"Query master@{2005-05-25} (before history)" \
 	'rm -f o e
-	 git-rev-parse --verify master@2005-05-25 >o 2>e &&
+	 git-rev-parse --verify master@{2005-05-25} >o 2>e &&
 	 test $C = $(cat o) &&
 	 echo test "warning: Log .git/logs/$m only goes back to $ed." = "$(cat e)"'
 test_expect_success \
-	'Query "master@May 26 2005 23:31:59" (1 second before history)' \
+	'Query "master@{May 26 2005 23:31:59}" (1 second before history)' \
 	'rm -f o e
-	 git-rev-parse --verify "master@May 26 2005 23:31:59" >o 2>e &&
+	 git-rev-parse --verify "master@{May 26 2005 23:31:59}" >o 2>e &&
 	 test $C = $(cat o) &&
 	 test "warning: Log .git/logs/$m only goes back to $ed." = "$(cat e)"'
 test_expect_success \
-	'Query "master@May 26 2005 23:32:00" (exactly history start)' \
+	'Query "master@{May 26 2005 23:32:00}" (exactly history start)' \
 	'rm -f o e
-	 git-rev-parse --verify "master@May 26 2005 23:32:00" >o 2>e &&
+	 git-rev-parse --verify "master@{May 26 2005 23:32:00}" >o 2>e &&
 	 test $A = $(cat o) &&
 	 test "" = "$(cat e)"'
 test_expect_success \
-	'Query "master@2005-05-26 23:33:01" (middle of history with gap)' \
+	'Query "master@{2005-05-26 23:33:01}" (middle of history with gap)' \
 	'rm -f o e
-	 git-rev-parse --verify "master@2005-05-26 23:33:01" >o 2>e &&
+	 git-rev-parse --verify "master@{2005-05-26 23:33:01}" >o 2>e &&
 	 test $B = $(cat o) &&
 	 test "warning: Log .git/logs/$m has gap after $gd." = "$(cat e)"'
 test_expect_success \
-	'Query "master@2005-05-26 23:33:01" (middle of history)' \
+	'Query "master@{2005-05-26 23:38:00}" (middle of history)' \
 	'rm -f o e
-	 git-rev-parse --verify "master@2005-05-26 23:38:00" >o 2>e &&
+	 git-rev-parse --verify "master@{2005-05-26 23:38:00}" >o 2>e &&
 	 test $Z = $(cat o) &&
 	 test "" = "$(cat e)"'
 test_expect_success \
-	'Query "master@2005-05-26 23:43:00" (exact end of history)' \
+	'Query "master@{2005-05-26 23:43:00}" (exact end of history)' \
 	'rm -f o e
-	 git-rev-parse --verify "master@2005-05-26 23:43:00" >o 2>e &&
+	 git-rev-parse --verify "master@{2005-05-26 23:43:00}" >o 2>e &&
 	 test $E = $(cat o) &&
 	 test "" = "$(cat e)"'
 test_expect_success \
-	'Query "master@2005-05-28" (past end of history)' \
+	'Query "master@{2005-05-28}" (past end of history)' \
 	'rm -f o e
-	 git-rev-parse --verify "master@2005-05-28" >o 2>e &&
+	 git-rev-parse --verify "master@{2005-05-28}" >o 2>e &&
 	 test $D = $(cat o) &&
 	 test "warning: Log .git/logs/$m unexpectedly ended on $ld." = "$(cat e)"'
 
+
+rm -f .git/$m .git/logs/$m expect
+
+test_expect_success \
+    'creating initial files' \
+    'cp ../../COPYING COPYING &&
+     git-add COPYING &&
+	 GIT_COMMITTER_DATE="2005-05-26 23:30" git-commit -m add -a &&
+	 cp ../../Makefile COPYING &&
+	 GIT_COMMITTER_DATE="2005-05-26 23:41" git-commit -m change -a'
+
+test_expect_success \
+	'git-cat-file blob master:COPYING (expect Makefile)' \
+	'git-cat-file blob master:COPYING | diff - ../../Makefile'
+test_expect_success \
+	'git-cat-file blob master@{2005-05-26 23:30}:COPYING (expect COPYING)' \
+	'git-cat-file blob "master@{2005-05-26 23:30}:COPYING" \
+	  | diff - ../../COPYING'
+test_expect_success \
+	'git-cat-file blob master@{2005-05-26 23:42}:COPYING (expect Makefile)' \
+	'git-cat-file blob "master@{2005-05-26 23:42}:COPYING" \
+	  | diff - ../../Makefile'
+
 test_done