Merge branch 'fix'

Junio C Hamano · Junio C Hamano · commit 752b0fe28718 · 2006-02-22T00:35:07.000-08:00
* fix:
  git-push: Update documentation to describe the no-refspec behavior.
  format-patch: pretty-print timestamp correctly.
  git-add: Add support for --, documentation, and test.
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
@@ -7,7 +7,7 @@ git-add - Add files to the index file.
 
 SYNOPSIS
 --------
-'git-add' [-n] [-v] <file>...
+'git-add' [-n] [-v] [--] <file>...
 
 DESCRIPTION
 -----------
@@ -26,6 +26,11 @@ OPTIONS
 -v::
         Be verbose.
 
+--::
+	This option can be used to separate command-line options from
+	the list of files, (useful when filenames might be mistaken
+	for command-line options).
+
 
 DISCUSSION
 ----------
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
@@ -43,6 +43,12 @@ to fast forward the remote ref that matches <dst>.  If
 the optional plus `+` is used, the remote ref is updated
 even if it does not result in a fast forward update.
 +
+Note: If no explicit refspec is found, (that is neither
+on the command line nor in any Push line of the
+corresponding remotes file---see below), then all the
+refs that exist both on the local side and on the remote
+side are updated.
++
 Some short-cut notations are also supported.
 +
 * `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.
diff --git a/git-add.sh b/git-add.sh
@@ -14,6 +14,10 @@ while : ; do
     -v)
 	verbose=--verbose
 	;;
+    --)
+	shift
+	break
+	;;
     -*)
 	usage
 	;;
diff --git a/git-format-patch.sh b/git-format-patch.sh
@@ -189,7 +189,7 @@ my @month_names = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
 sub show_date {
     my ($time, $tz) = @_;
     my $minutes = abs($tz);
-    $minutes = ($minutes / 100) * 60 + ($minutes % 100);
+    $minutes = int($minutes / 100) * 60 + ($minutes % 100);
     if ($tz < 0) {
         $minutes = -$minutes;
     }
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# Copyright (c) 2006 Carl D. Worth
+#
+
+test_description='Test of git-add, including the -- option.'
+
+. ./test-lib.sh
+
+test_expect_success \
+    'Test of git-add' \
+    'touch foo && git-add foo'
+
+test_expect_success \
+    'Post-check that foo is in the index' \
+    'git-ls-files foo | grep foo'
+
+test_expect_success \
+    'Test that "git-add -- -q" works' \
+    'touch -- -q && git-add -- -q'
+
+test_done

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,12 @@ to fast forward the remote ref that matches <dst>. If`
`43`	`43`	the optional plus `+` is used, the remote ref is updated
`44`	`44`	`even if it does not result in a fast forward update.`
`45`	`45`	`+`
	`46`	`+Note: If no explicit refspec is found, (that is neither`
	`47`	`+on the command line nor in any Push line of the`
	`48`	`+corresponding remotes file---see below), then all the`
	`49`	`+refs that exist both on the local side and on the remote`
	`50`	`+side are updated.`
	`51`	`++`
`46`	`52`	`Some short-cut notations are also supported.`
`47`	`53`	`+`
`48`	`54`	* `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.
-Original file line number
+Diff line change
     -v)
 	verbose=--verbose
 	;;
 +    --)
 +	shift
 +	break
 +	;;
     -*)
 	usage
 	;;
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ my @month_names = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);`
`189`	`189`	`sub show_date {`
`190`	`190`	`my ($time, $tz) = @_;`
`191`	`191`	`my $minutes = abs($tz);`
`192`		`- $minutes = ($minutes / 100) * 60 + ($minutes % 100);`
	`192`	`+ $minutes = int($minutes / 100) * 60 + ($minutes % 100);`
`193`	`193`	`if ($tz < 0) {`
`194`	`194`	`$minutes = -$minutes;`
`195`	`195`	`}`