[PATCH v2 1/6] Fix 'git var' usage synopsis

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Feb 15, 2010, 02:36 UTC
Message-ID: <20100215023636.GA17444@progeny.tock>
In-Reply-To: <20100214115533.GA3499@progeny.tock>

Jonathan Nieder wrote:

Show 10 quoted lines

> --- a/builtin-var.c
> +++ b/builtin-var.c
> @@ -6,7 +6,7 @@
>  #include "cache.h"
>  #include "exec_cmd.h"
>  
> -static const char var_usage[] = "git var [-l | <variable>]";
> +static const char var_usage[] = "git var (-l | <variable>)";
>  static const char *editor(int flag)
>  {

As Junio noticed, this doesn’t apply. The problem is a missing blank line between the static const char var_usage and static const char *editor lines. Worse still, I have no clue how it happened.

Here’s a revised patch (generated just like the first one...). It is really an independent fix from the rest of the series.

-- %< --
Subject: Fix 'git var' usage synopsis

The parameter to 'git var' is not optional.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 Documentation/git-var.txt |    2 +-
 builtin-var.c             |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt
index bb98182..458f3e2 100644
--- a/Documentation/git-var.txt
+++ b/Documentation/git-var.txt
@@ -8,7 +8,7 @@ git-var - Show a git logical variable
 
 SYNOPSIS
 --------
-'git var' [ -l | <variable> ]
+'git var' ( -l | <variable> )
 
 DESCRIPTION
 -----------
diff --git a/builtin-var.c b/builtin-var.c
index 2280518..e6ee7bc 100644
--- a/builtin-var.c
+++ b/builtin-var.c
@@ -6,7 +6,7 @@
 #include "cache.h"
 #include "exec_cmd.h"
 
-static const char var_usage[] = "git var [-l | <variable>]";
+static const char var_usage[] = "git var (-l | <variable>)";
 
 static const char *editor(int flag)
 {

-- 
1.7.0