[PATCH 0/4] trivial patches

Hi,

Here's a bunch of trivial style cleanup patches.

Felipe Contreras (4):
  documentation: trivial style cleanups
  transport-helper: trivial style cleanup
  {fast-export,transport-helper}: style cleanups
  fast-export: trivial cleanup

 Documentation/git-am.txt               |  7 +++----
 Documentation/git-archive.txt          |  2 +-
 Documentation/git-check-ref-format.txt |  3 +--
 Documentation/git-clone.txt            |  4 ++--
 Documentation/git-commit.txt           |  2 +-
 Documentation/git-config.txt           |  3 +--
 Documentation/git-daemon.txt           |  5 ++---
 Documentation/git-difftool.txt         |  3 +--
 Documentation/git-fast-export.txt      | 10 +++++-----
 Documentation/git-fetch-pack.txt       |  6 +++---
 Documentation/git-fmt-merge-msg.txt    |  3 +--
 Documentation/git-fsck.txt             |  6 ++----
 Documentation/git-grep.txt             |  2 +-
 Documentation/git-mailinfo.txt         |  2 +-
 Documentation/git-merge.txt            |  3 +--
 Documentation/git-mergetool.txt        |  2 +-
 Documentation/git-push.txt             |  3 +--
 Documentation/git-remote.txt           |  2 +-
 Documentation/git-revert.txt           |  2 +-
 Documentation/git-update-index.txt     | 10 ++++------
 builtin/fast-export.c                  | 29 +++++++++++++----------------
 transport-helper.c                     |  3 +--
 22 files changed, 48 insertions(+), 64 deletions(-)

-- 
1.8.3.rc1.553.gac13664

Cast the object to a commit, only to get the object back?

Signed-off-by: Felipe Contreras <redacted>
---
 builtin/fast-export.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 8091354..d24b4d9 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c

@@ -550,7 +550,6 @@ static void get_tags_and_duplicates(struct rev_cmdline_info *info,
 
 static void handle_tags_and_duplicates(struct string_list *extra_refs)
 {
-	struct commit *commit;
 	int i;
 
 	for (i = extra_refs->nr - 1; i >= 0; i--) {

@@ -562,9 +561,7 @@ static void handle_tags_and_duplicates(struct string_list *extra_refs)
 			break;
 		case OBJ_COMMIT:
 			/* create refs pointing to already seen commits */
-			commit = (struct commit *)object;
-			printf("reset %s\nfrom :%d\n\n", name,
-			       get_object_mark(&commit->object));
+			printf("reset %s\nfrom :%d\n\n", name, get_object_mark(object));
 			show_progress();
 			break;
 		}

-- 
1.8.3.rc1.553.gac13664

Signed-off-by: Felipe Contreras <redacted>
---
 transport-helper.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/transport-helper.c b/transport-helper.c
index 835815f..522d791 100644
--- a/transport-helper.c
+++ b/transport-helper.c

@@ -214,9 +214,8 @@ static struct child_process *get_helper(struct transport *transport)
 		int i;
 		data->refspec_nr = refspec_nr;
 		data->refspecs = parse_fetch_refspec(refspec_nr, refspecs);
-		for (i = 0; i < refspec_nr; i++) {
+		for (i = 0; i < refspec_nr; i++)
 			free((char *)refspecs[i]);
-		}
 		free(refspecs);
 	}
 	strbuf_release(&buf);

-- 
1.8.3.rc1.553.gac13664

Signed-off-by: Felipe Contreras <redacted>
---
 builtin/fast-export.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index d60d675..8091354 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c

@@ -135,7 +135,7 @@ static void export_blob(const unsigned char *sha1)
 
 	buf = read_sha1_file(sha1, &type, &size);
 	if (!buf)
-		die ("Could not read blob %s", sha1_to_hex(sha1));
+		die("Could not read blob %s", sha1_to_hex(sha1));
 	if (check_sha1_signature(sha1, buf, size, typename(type)) < 0)
 		die("sha1 mismatch in blob %s", sha1_to_hex(sha1));
 	object = parse_object_buffer(sha1, type, size, buf, &eaten);

@@ -146,7 +146,7 @@ static void export_blob(const unsigned char *sha1)
 
 	printf("blob\nmark :%"PRIu32"\ndata %lu\n", last_idnum, size);
 	if (size && fwrite(buf, size, 1, stdout) != 1)
-		die_errno ("Could not write blob '%s'", sha1_to_hex(sha1));
+		die_errno("Could not write blob '%s'", sha1_to_hex(sha1));
 	printf("\n");
 
 	show_progress();

@@ -289,13 +289,13 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
 	parse_commit(commit);
 	author = strstr(commit->buffer, "\nauthor ");
 	if (!author)
-		die ("Could not find author in commit %s",
+		die("Could not find author in commit %s",
 		     sha1_to_hex(commit->object.sha1));
 	author++;
 	author_end = strchrnul(author, '\n');
 	committer = strstr(author_end, "\ncommitter ");
 	if (!committer)
-		die ("Could not find committer in commit %s",
+		die("Could not find committer in commit %s",
 		     sha1_to_hex(commit->object.sha1));
 	committer++;
 	committer_end = strchrnul(committer, '\n');

@@ -395,7 +395,7 @@ static void handle_tag(const char *name, struct tag *tag)
 
 	buf = read_sha1_file(tag->object.sha1, &type, &size);
 	if (!buf)
-		die ("Could not read tag %s", sha1_to_hex(tag->object.sha1));
+		die("Could not read tag %s", sha1_to_hex(tag->object.sha1));
 	message = memmem(buf, size, "\n\n", 2);
 	if (message) {
 		message += 2;

@@ -421,11 +421,11 @@ static void handle_tag(const char *name, struct tag *tag)
 		if (signature)
 			switch(signed_tag_mode) {
 			case ABORT:
-				die ("Encountered signed tag %s; use "
+				die("Encountered signed tag %s; use "
 				     "--signed-tags=<mode> to handle it.",
 				     sha1_to_hex(tag->object.sha1));
 			case WARN:
-				warning ("Exporting signed tag %s",
+				warning("Exporting signed tag %s",
 					 sha1_to_hex(tag->object.sha1));
 				/* fallthru */
 			case VERBATIM:

@@ -446,7 +446,7 @@ static void handle_tag(const char *name, struct tag *tag)
 	if (!tagged_mark) {
 		switch(tag_of_filtered_mode) {
 		case ABORT:
-			die ("Tag %s tags unexported object; use "
+			die("Tag %s tags unexported object; use "
 			     "--tag-of-filtered-object=<mode> to handle it.",
 			     sha1_to_hex(tag->object.sha1));
 		case DROP:

@@ -454,7 +454,7 @@ static void handle_tag(const char *name, struct tag *tag)
 			return;
 		case REWRITE:
 			if (tagged->type != OBJ_COMMIT) {
-				die ("Tag %s tags unexported %s!",
+				die("Tag %s tags unexported %s!",
 				     sha1_to_hex(tag->object.sha1),
 				     typename(tagged->type));
 			}

@@ -467,7 +467,7 @@ static void handle_tag(const char *name, struct tag *tag)
 				if (!(p->object.flags & TREESAME))
 					break;
 				if (!p->parents)
-					die ("Can't find replacement commit for tag %s\n",
+					die("Can't find replacement commit for tag %s\n",
 					     sha1_to_hex(tag->object.sha1));
 				p = p->parents->item;
 			}

@@ -677,7 +677,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 	};
 
 	if (argc == 1)
-		usage_with_options (fast_export_usage, options);
+		usage_with_options(fast_export_usage, options);
 
 	/* we handle encodings */
 	git_config(git_default_config, NULL);

@@ -689,7 +689,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 	argc = setup_revisions(argc, argv, &revs, NULL);
 	argc = parse_options(argc, argv, prefix, options, fast_export_usage, 0);
 	if (argc > 1)
-		usage_with_options (fast_export_usage, options);
+		usage_with_options(fast_export_usage, options);
 
 	if (use_done_feature)
 		printf("feature done\n");

-- 
1.8.3.rc1.553.gac13664

White-spaces, missing braces, standardize --[no-]foo.

Signed-off-by: Felipe Contreras <redacted>
---
 Documentation/git-am.txt               |  7 +++----
 Documentation/git-archive.txt          |  2 +-
 Documentation/git-check-ref-format.txt |  3 +--
 Documentation/git-clone.txt            |  4 ++--
 Documentation/git-commit.txt           |  2 +-
 Documentation/git-config.txt           |  3 +--
 Documentation/git-daemon.txt           |  5 ++---
 Documentation/git-difftool.txt         |  3 +--
 Documentation/git-fast-export.txt      | 10 +++++-----
 Documentation/git-fetch-pack.txt       |  6 +++---
 Documentation/git-fmt-merge-msg.txt    |  3 +--
 Documentation/git-fsck.txt             |  6 ++----
 Documentation/git-grep.txt             |  2 +-
 Documentation/git-mailinfo.txt         |  2 +-
 Documentation/git-merge.txt            |  3 +--
 Documentation/git-mergetool.txt        |  2 +-
 Documentation/git-push.txt             |  3 +--
 Documentation/git-remote.txt           |  2 +-
 Documentation/git-revert.txt           |  2 +-
 Documentation/git-update-index.txt     | 10 ++++------
 20 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 19d57a8..5bbe7b6 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt

@@ -9,12 +9,12 @@ git-am - Apply a series of patches from a mailbox
 SYNOPSIS
 --------
 [verse]
-'git am' [--signoff] [--keep] [--keep-cr | --no-keep-cr] [--utf8 | --no-utf8]
+'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]
 	 [--3way] [--interactive] [--committer-date-is-author-date]
 	 [--ignore-date] [--ignore-space-change | --ignore-whitespace]
 	 [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
 	 [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
-	 [--scissors | --no-scissors]
+	 [--[no-]scissors]
 	 [(<mbox> | <Maildir>)...]
 'git am' (--continue | --skip | --abort)
 

@@ -43,8 +43,7 @@ OPTIONS
 --keep-non-patch::
 	Pass `-b` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
 
---keep-cr::
---no-keep-cr::
+--[no-]keep-cr::
 	With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1])
 	with the same option, to prevent it from stripping CR at the end of
 	lines. `am.keepcr` configuration variable can be used to specify the

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index 250e522..b97aaab 100644
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt

@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
-	      [-o | --output=<file>] [--worktree-attributes]
+	      [-o <file> | --output=<file>] [--worktree-attributes]
 	      [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
 	      [<path>...]
 

diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt
index ec1739a..a49be1b 100644
--- a/Documentation/git-check-ref-format.txt
+++ b/Documentation/git-check-ref-format.txt

@@ -83,8 +83,7 @@ typed the branch name.
 
 OPTIONS
 -------
---allow-onelevel::
---no-allow-onelevel::
+--[no-]allow-onelevel::
 	Controls whether one-level refnames are accepted (i.e.,
 	refnames that do not contain multiple `/`-separated
 	components).  The default is `--no-allow-onelevel`.

diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 5c16e31..a0727d7 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt

@@ -14,7 +14,7 @@ SYNOPSIS
 	  [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
 	  [--separate-git-dir <git dir>]
 	  [--depth <depth>] [--[no-]single-branch]
-	  [--recursive|--recurse-submodules] [--] <repository>
+	  [--recursive | --recurse-submodules] [--] <repository>
 	  [<directory>]
 
 DESCRIPTION

@@ -188,7 +188,7 @@ objects from the source repository into a pack in the cloned repository.
 	with a long history, and would want to send in fixes
 	as patches.
 
---single-branch::
+--[no-]single-branch::
 	Clone only the history leading to the tip of a single branch,
 	either specified by the `--branch` option or the primary
 	branch remote's `HEAD` points at. When creating a shallow

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 8172938..1a7616c 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt

@@ -12,7 +12,7 @@ SYNOPSIS
 	   [--dry-run] [(-c | -C | --fixup | --squash) <commit>]
 	   [-F <file> | -m <msg>] [--reset-author] [--allow-empty]
 	   [--allow-empty-message] [--no-verify] [-e] [--author=<author>]
-	   [--date=<date>] [--cleanup=<mode>] [--status | --no-status]
+	   [--date=<date>] [--cleanup=<mode>] [--[no-]status]
 	   [-i | -o] [-S[<keyid>]] [--] [<file>...]
 
 DESCRIPTION

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 9ae2508..d88a6fc 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt

@@ -186,8 +186,7 @@ See also <<FILES>>.
 	Opens an editor to modify the specified config file; either
 	'--system', '--global', or repository (default).
 
---includes::
---no-includes::
+--[no-]includes::
 	Respect `include.*` directives in config files when looking up
 	values. Defaults to on.
 

diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index bfb106c..61a5701 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt

@@ -17,7 +17,7 @@ SYNOPSIS
 	     [--enable=<service>] [--disable=<service>]
 	     [--allow-override=<service>] [--forbid-override=<service>]
 	     [--access-hook=<path>]
-	     [--inetd | [--listen=<host_or_ipaddr>] [--port=<n>] [--user=<user> [--group=<group>]]
+	     [--inetd | [--listen=<host_or_ipaddr>] [--port=<n>] [--user=<user> [--group=<group>]]]
 	     [<directory>...]
 
 DESCRIPTION

@@ -169,8 +169,7 @@ Git configuration files in that directory are readable by `<user>`.
 	repository configuration.  By default, all the services
 	are overridable.
 
---informative-errors::
---no-informative-errors::
+--[no-]informative-errors::
 	When informative errors are turned on, git-daemon will report
 	more verbose errors to the client, differentiating conditions
 	like "no such repository" from "repository not exported". This

diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 8361e6e..11887e6 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt

@@ -69,8 +69,7 @@ with custom merge tool commands and has the same value as `$MERGED`.
 --tool-help::
 	Print a list of diff tools that may be used with `--tool`.
 
---symlinks::
---no-symlinks::
+--[no-]symlinks::
 	'git difftool''s default behavior is create symlinks to the
 	working tree when run in `--dir-diff` mode and the right-hand
 	side of the comparison yields the same content as the file in

diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt
index 03fc8c3..efb0380 100644
--- a/Documentation/git-fast-export.txt
+++ b/Documentation/git-fast-export.txt

@@ -106,11 +106,11 @@ marks the same across runs.
 	different from the commit's first parent).
 
 [<git-rev-list-args>...]::
-       A list of arguments, acceptable to 'git rev-parse' and
-       'git rev-list', that specifies the specific objects and references
-       to export.  For example, `master~10..master` causes the
-       current master reference to be exported along with all objects
-       added since its 10th ancestor commit.
+	A list of arguments, acceptable to 'git rev-parse' and
+	'git rev-list', that specifies the specific objects and references
+	to export.  For example, `master~10..master` causes the
+	current master reference to be exported along with all objects
+	added since its 10th ancestor commit.
 
 EXAMPLES
 --------

diff --git a/Documentation/git-fetch-pack.txt b/Documentation/git-fetch-pack.txt
index b81e90d..1e71754 100644
--- a/Documentation/git-fetch-pack.txt
+++ b/Documentation/git-fetch-pack.txt

@@ -10,9 +10,9 @@ SYNOPSIS
 --------
 [verse]
 'git fetch-pack' [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag]
-				[--upload-pack=<git-upload-pack>]
-				[--depth=<n>] [--no-progress]
-				[-v] [<host>:]<directory> [<refs>...]
+	[--upload-pack=<git-upload-pack>]
+	[--depth=<n>] [--no-progress]
+	[-v] [<host>:]<directory> [<refs>...]
 
 DESCRIPTION
 -----------

diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 3a0f55e..bb1232a 100644
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt

@@ -35,8 +35,7 @@ OPTIONS
 	Do not list one-line descriptions from the actual commits being
 	merged.
 
---summary::
---no-summary::
+--[no-]summary::
 	Synonyms to --log and --no-log; these are deprecated and will be
 	removed in the future.
 

diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt
index e5878bd..25c431d 100644
--- a/Documentation/git-fsck.txt
+++ b/Documentation/git-fsck.txt

@@ -30,8 +30,7 @@ index file, all SHA-1 references in `refs` namespace, and all reflogs
 	Print out objects that exist but that aren't reachable from any
 	of the reference nodes.
 
---dangling::
---no-dangling::
+--[no-]dangling::
 	Print objects that exist but that are never 'directly' used (default).
 	`--no-dangling` can be used to omit this information from the output.
 

@@ -78,8 +77,7 @@ index file, all SHA-1 references in `refs` namespace, and all reflogs
 	a blob, the contents are written into the file, rather than
 	its object name.
 
---progress::
---no-progress::
+--[no-]progress::
 	Progress status is reported on the standard error stream by
 	default when it is attached to a terminal, unless
 	--no-progress or --verbose is specified. --progress forces

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 50d46e1..8497aa4 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt

@@ -25,7 +25,7 @@ SYNOPSIS
 	   [-W | --function-context]
 	   [-f <file>] [-e] <pattern>
 	   [--and|--or|--not|(|)|-e <pattern>...]
-	   [ [--exclude-standard] [--cached | --no-index | --untracked] | <tree>...]
+	   [ [--[no-]exclude-standard] [--cached | --no-index | --untracked] | <tree>...]
 	   [--] [<pathspec>...]
 
 DESCRIPTION

diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index 97e7a8e..164a3c6 100644
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/git-mailinfo.txt

@@ -9,7 +9,7 @@ git-mailinfo - Extracts patch and authorship from a single e-mail message
 SYNOPSIS
 --------
 [verse]
-'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n] [--scissors] <msg> <patch>
+'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n] [--[no-]scissors] <msg> <patch>
 
 
 DESCRIPTION

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 42391f2..67ca99c 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt

@@ -76,8 +76,7 @@ The 'git fmt-merge-msg' command can be
 used to give a good default for automated 'git merge'
 invocations.
 
---rerere-autoupdate::
---no-rerere-autoupdate::
+--[no-]rerere-autoupdate::
 	Allow the rerere mechanism to update the index with the
 	result of auto-conflict resolution if possible.
 

diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 6b563c5..d758f3a 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt

@@ -8,7 +8,7 @@ git-mergetool - Run merge conflict resolution tools to resolve merge conflicts
 SYNOPSIS
 --------
 [verse]
-'git mergetool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>...]
+'git mergetool' [--tool=<tool>] [-y|--[no-]prompt] [<file>...]
 
 DESCRIPTION
 -----------

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index eb2883c..d514813 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt

@@ -162,8 +162,7 @@ useful if you write an alias or script around 'git push'.
 	linkgit:git-pull[1] and other commands. For more information,
 	see 'branch.<name>.merge' in linkgit:git-config[1].
 
---thin::
---no-thin::
+--[no-]thin::
 	These options are passed to linkgit:git-send-pack[1]. A thin transfer
 	significantly reduces the amount of sent data when the sender and
 	receiver share many of the same objects in common. The default is

diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 7a6f354..581bb4c 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt

@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git remote' [-v | --verbose]
-'git remote add' [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--mirror=<fetch|push>] <name> <url>
+'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>
 'git remote rename' <old> <new>
 'git remote remove' <name>
 'git remote set-head' <name> (-a | -d | <branch>)

diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index 70152e8..f79c9d8 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt

@@ -8,7 +8,7 @@ git-revert - Revert some existing commits
 SYNOPSIS
 --------
 [verse]
-'git revert' [--edit | --no-edit] [-n] [-m parent-number] [-s] <commit>...
+'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] <commit>...
 'git revert' --continue
 'git revert' --quit
 'git revert' --abort

diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 670e9fb..e0a8702 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt

@@ -14,8 +14,8 @@ SYNOPSIS
 	     [--refresh] [-q] [--unmerged] [--ignore-missing]
 	     [(--cacheinfo <mode> <object> <file>)...]
 	     [--chmod=(+|-)x]
-	     [--assume-unchanged | --no-assume-unchanged]
-	     [--skip-worktree | --no-skip-worktree]
+	     [--[no-]assume-unchanged]
+	     [--[no-]skip-worktree]
 	     [--ignore-submodules]
 	     [--really-refresh] [--unresolve] [--again | -g]
 	     [--info-only] [--index-info]

@@ -77,8 +77,7 @@ OPTIONS
 --chmod=(+|-)x::
         Set the execute permissions on the updated files.
 
---assume-unchanged::
---no-assume-unchanged::
+--[no-]assume-unchanged::
 	When these flags are specified, the object names recorded
 	for the paths are not updated.  Instead, these options
 	set and unset the "assume unchanged" bit for the

@@ -102,8 +101,7 @@ you will need to handle the situation manually.
 	Like '--refresh', but checks stat information unconditionally,
 	without regard to the "assume unchanged" setting.
 
---skip-worktree::
---no-skip-worktree::
+--[no-]skip-worktree::
 	When one of these flags is specified, the object name recorded
 	for the paths are not updated. Instead, these options
 	set and unset the "skip-worktree" bit for the paths. See

-- 
1.8.3.rc1.553.gac13664

On Wed, May 8, 2013 at 9:16 PM, Felipe Contreras
[off-list ref] wrote:

[snip]

It looks like your simple replace didn't account for calls with
multiple lines.  Now the remaining lines don't line up.
:-)  There's several more places like this in the patch.

-John

On Thu, May 9, 2013 at 3:46 AM, John Szakmeister [off-list ref] wrote:

On Wed, May 8, 2013 at 9:16 PM, Felipe Contreras
[off-list ref] wrote:

quoted

Signed-off-by: Felipe Contreras <redacted>
---
 builtin/fast-export.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index d60d675..8091354 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c

@@ -135,7 +135,7 @@ static void export_blob(const unsigned char *sha1)

[snip]

quoted

@@ -289,13 +289,13 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
        parse_commit(commit);
        author = strstr(commit->buffer, "\nauthor ");
        if (!author)
-               die ("Could not find author in commit %s",
+               die("Could not find author in commit %s",
                     sha1_to_hex(commit->object.sha1));

It looks like your simple replace didn't account for calls with
multiple lines.  Now the remaining lines don't line up.
:-)  There's several more places like this in the patch.

AFAIK neither the git or the Linux code-style specify how multiple
lines with open parenthesis should align.

-- 
Felipe Contreras

On Wed, May 8, 2013 at 9:16 PM, Felipe Contreras
[off-list ref] wrote:

FWIW, this line is now too long (exceeds 80 columns).  Good catch on
the casting though.

-John

PS  Sorry for the duplicate Felipe... I still need to get used to
hitting "Reply All". :-)

On Thu, May 9, 2013 at 3:52 AM, John Szakmeister [off-list ref] wrote:

On Wed, May 8, 2013 at 9:16 PM, Felipe Contreras
[off-list ref] wrote:

quoted

Cast the object to a commit, only to get the object back?

Signed-off-by: Felipe Contreras <redacted>
---
 builtin/fast-export.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 8091354..d24b4d9 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c

@@ -550,7 +550,6 @@ static void get_tags_and_duplicates(struct rev_cmdline_info *info,

 static void handle_tags_and_duplicates(struct string_list *extra_refs)
 {
-       struct commit *commit;
        int i;

        for (i = extra_refs->nr - 1; i >= 0; i--) {

@@ -562,9 +561,7 @@ static void handle_tags_and_duplicates(struct string_list *extra_refs)
                        break;
                case OBJ_COMMIT:
                        /* create refs pointing to already seen commits */
-                       commit = (struct commit *)object;
-                       printf("reset %s\nfrom :%d\n\n", name,
-                              get_object_mark(&commit->object));
+                       printf("reset %s\nfrom :%d\n\n", name, get_object_mark(object));

FWIW, this line is now too long (exceeds 80 columns).  Good catch on
the casting though.

-John

PS  Sorry for the duplicate Felipe... I still need to get used to
hitting "Reply All". :-)

The guideline is:

 - We try to keep to at most 80 characters per line.

The key word being *try*.

-- 
Felipe Contreras

On Thu, May 9, 2013 at 4:53 AM, Felipe Contreras
[off-list ref] wrote:
[snip]

quoted

quoted

@@ -562,9 +561,7 @@ static void handle_tags_and_duplicates(struct string_list *extra_refs)
                        break;
                case OBJ_COMMIT:
                        /* create refs pointing to already seen commits */
-                       commit = (struct commit *)object;
-                       printf("reset %s\nfrom :%d\n\n", name,
-                              get_object_mark(&commit->object));
+                       printf("reset %s\nfrom :%d\n\n", name, get_object_mark(object));

FWIW, this line is now too long (exceeds 80 columns).  Good catch on
the casting though.

-John

PS  Sorry for the duplicate Felipe... I still need to get used to
hitting "Reply All". :-)

The guideline is:

 - We try to keep to at most 80 characters per line.

The key word being *try*.

I saw that, but you actively joined the lines, and there was no need
to.  It didn't even require trying to keep it within 80 columns. :-)

-John

On Thu, May 9, 2013 at 4:50 AM, Felipe Contreras
[off-list ref] wrote:

On Thu, May 9, 2013 at 3:46 AM, John Szakmeister [off-list ref] wrote:

quoted

On Wed, May 8, 2013 at 9:16 PM, Felipe Contreras

[snip]

quoted

quoted

@@ -289,13 +289,13 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
        parse_commit(commit);
        author = strstr(commit->buffer, "\nauthor ");
        if (!author)
-               die ("Could not find author in commit %s",
+               die("Could not find author in commit %s",
                     sha1_to_hex(commit->object.sha1));

It looks like your simple replace didn't account for calls with
multiple lines.  Now the remaining lines don't line up.
:-)  There's several more places like this in the patch.

AFAIK neither the git or the Linux code-style specify how multiple
lines with open parenthesis should align.

True, but I'm sure you know well that the Linux coding style tends to
follow the GNU coding style--with modifications--which lines up args
with the first character inside the paren
(http://www.gnu.org/prep/standards/html_node/Formatting.html#Formatting-Your-Source-Code),
and it's clear that's what the previous author had done.

The hope was that you let your search and replace run awry, and I was
just pointing out that it did, so it could fixed it up.  *shrug*  I've
had little participation, so I don't consider my opinion to count for
much on the matter.

-John

On Thu, May 9, 2013 at 4:30 AM, John Szakmeister [off-list ref] wrote:

On Thu, May 9, 2013 at 4:50 AM, Felipe Contreras
[off-list ref] wrote:

quoted

On Thu, May 9, 2013 at 3:46 AM, John Szakmeister [off-list ref] wrote:

quoted

On Wed, May 8, 2013 at 9:16 PM, Felipe Contreras

[snip]

quoted

quoted

quoted

@@ -289,13 +289,13 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
        parse_commit(commit);
        author = strstr(commit->buffer, "\nauthor ");
        if (!author)
-               die ("Could not find author in commit %s",
+               die("Could not find author in commit %s",
                     sha1_to_hex(commit->object.sha1));

It looks like your simple replace didn't account for calls with
multiple lines.  Now the remaining lines don't line up.
:-)  There's several more places like this in the patch.

AFAIK neither the git or the Linux code-style specify how multiple
lines with open parenthesis should align.

True, but I'm sure you know well that the Linux coding style tends to
follow the GNU coding style--with modifications--which lines up args
with the first character inside the paren
(http://www.gnu.org/prep/standards/html_node/Formatting.html#Formatting-Your-Source-Code),
and it's clear that's what the previous author had done.

No, I don't. I don't see how the GNU style has anything to do with the
Linux style.

-- 
Felipe Contreras

Felipe Contreras wrote:

AFAIK neither the git or the Linux code-style specify how multiple
lines with open parenthesis should align.

git style inherits from linux style.  See Chapter 9 of
Documentation/CodingStyle in linux.git.  It has elisp snippets you can
stick in your .emacs.

On Thu, May 9, 2013 at 5:24 AM, Ramkumar Ramachandra [off-list ref] wrote:

Felipe Contreras wrote:

quoted

AFAIK neither the git or the Linux code-style specify how multiple
lines with open parenthesis should align.

git style inherits from linux style.  See Chapter 9 of
Documentation/CodingStyle in linux.git.  It has elisp snippets you can
stick in your .emacs.

I don't see anything in Chapter 9 mentioning the alignment of
parenthesis. This has been discussed multiple times in the Linux
mailing lists, nobody cares enough about it to add such alignment
guidelines to the documentation.

-- 
Felipe Contreras

Felipe Contreras [off-list ref] writes:

White-spaces, missing braces, standardize --[no-]foo.

Signed-off-by: Felipe Contreras <redacted>

This is uncomfortably big at this phase of the release cycle, but
thanks anyway.

Because I didn't want to review this patch only to spot silly
formatting mistakes that may break the documentation build (which I
didn't find any), I looked the entire files the patch touches, and
many of the comments below ended up being suggestions for a
follow-up work for people who would want to pick low-hanging fruits.

Hint, hint.

There however are a few things that should have been in this patch,
though.  I'll attach what I'd queue as "SQUASH???" on top of this
patch at the bottom.

OK.

We still have two separate entries for "--scissors/--no-scissors"
and "--utf8/--no-utf8" pairs in the description text.  Do they want
to get united somehow?

OK.

We have "--no-hardlinks" without "--hardlinks".  Does the parser
accept "--no-no-hardlinks"?  If so, we may want to error it out.

I would omit the options "--no-hardlinks" and "--shared", and added
"--local={link,copy,shared}" instead, as these two options only make
sense when cloning from a local repository, if I were doing the UI
from scratch today.

OK.

We have "--no-verify" without "--verify".  Does the parser accept
"--no-no-verify"?  If so we may want to error it out.

OK.

The SYNOPSIS section begins like this:

    SYNOPSIS
    --------
    [verse]
    'git config' [<file-option>] [type] [-z|--null] name [value [value_regex]]
    ...

Other parts of this patch seems to want to have SPs around vertical
bars that shows choices, so "[-z | --null]" would be necessary as a
follow-up to bring more consistency.

The placeholders like "type", "name", "value", etc. are not inside
<angle-brackets>, which may want to be fixed as well.

It is unclear what "<file-option>" is.  A few paragraphs in the
DESCRIPTION section talk about --system/global/etc.; there should be
a sentence there to mention that exact term <file-option> to help
the reader make a connection, just like the paragraph that talks
about "type" uses that word to make it clear the word in SYNOPSIS is
about things like --int/bool/path.

You can say "--inetd".  Only when you do not say "--inetd", you can
use "--listen", "--port", etc.  Further, only when you say "--user",
you can also say "--group".  OK.

As this is governed by [verse], it would be more helpful to show
that logic not just with the nesting of [], but make it stand out
with a line break, perhaps like:

        [--inetd |
         [--listen=<host>] [--port=<n>]
         [--user=<user> [--group=<group>]]]

(I do not mind to see a single line for the second and third lines).

OK.

By the way, this is missing from SYNOPSIS, unlike all the other
options to this command.

OK.

We have "--no-symlinks" without "--symlinks".  Does the parser
accept "--no-no-symlinks"?  If so, we may want to error it out.

OK.

We have "--no-data" without "--data".  Does the parser accept
"--no-no-data"?  If so, we may want to error it out.

OK.

We have "--no-progress" without "--progress".  Does the parser
accept "--no-no-progress"?  If so, we may want to error it out.

Other parts of this patch seems to want to have SPs around vertical
bars that shows choices, so "[-y | --[no-]prompt]" would be needed,
especially given that this patch touches that same line.

OK.

The DESCRIPTION section only describes "--no-edit", which may need
to be fixed.



-- squash --

    SQUASH???

    Update the overlong SYNOPSIS section for git-daemon. As the patch
    adds SPs around vertical bars for [choice1 | choice2], match the
    line it touches in git-mergetool.txt to also do that.

diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index 61a5701..223f731 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt

@@ -16,8 +16,10 @@ SYNOPSIS
 	     [--reuseaddr] [--detach] [--pid-file=<file>]
 	     [--enable=<service>] [--disable=<service>]
 	     [--allow-override=<service>] [--forbid-override=<service>]
-	     [--access-hook=<path>]
-	     [--inetd | [--listen=<host_or_ipaddr>] [--port=<n>] [--user=<user> [--group=<group>]]]
+	     [--access-hook=<path>] [--[no-]informative-errors]
+	     [--inetd |
+	      [--listen=<host_or_ipaddr>] [--port=<n>]
+	      [--user=<user> [--group=<group>]]]
 	     [<directory>...]
 
 DESCRIPTION

diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index d758f3a..07137f2 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt

@@ -8,7 +8,7 @@ git-mergetool - Run merge conflict resolution tools to resolve merge conflicts
 SYNOPSIS
 --------
 [verse]
-'git mergetool' [--tool=<tool>] [-y|--[no-]prompt] [<file>...]
+'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]
 
 DESCRIPTION
 -----------

John Szakmeister [off-list ref] writes:

On Wed, May 8, 2013 at 9:16 PM, Felipe Contreras
[off-list ref] wrote:

quoted

Signed-off-by: Felipe Contreras <redacted>
---
 builtin/fast-export.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index d60d675..8091354 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c

@@ -135,7 +135,7 @@ static void export_blob(const unsigned char *sha1)

[snip]

quoted

@@ -289,13 +289,13 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
        parse_commit(commit);
        author = strstr(commit->buffer, "\nauthor ");
        if (!author)
-               die ("Could not find author in commit %s",
+               die("Could not find author in commit %s",
                     sha1_to_hex(commit->object.sha1));

It looks like your simple replace didn't account for calls with
multiple lines.  Now the remaining lines don't line up.
:-)  There's several more places like this in the patch.

Good eyes.

Matching the coding-style to have no SP between function name and
its argument list is just as important as matching the indentation
style used in the project; trading one breakage with another does
not make much sense.

On Thu, May 9, 2013 at 6:09 PM, Junio C Hamano [off-list ref] wrote:

John Szakmeister [off-list ref] writes:

quoted

On Wed, May 8, 2013 at 9:16 PM, Felipe Contreras
[off-list ref] wrote:

quoted

Signed-off-by: Felipe Contreras <redacted>
---
 builtin/fast-export.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index d60d675..8091354 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c

@@ -135,7 +135,7 @@ static void export_blob(const unsigned char *sha1)

[snip]

quoted

@@ -289,13 +289,13 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
        parse_commit(commit);
        author = strstr(commit->buffer, "\nauthor ");
        if (!author)
-               die ("Could not find author in commit %s",
+               die("Could not find author in commit %s",
                     sha1_to_hex(commit->object.sha1));

It looks like your simple replace didn't account for calls with
multiple lines.  Now the remaining lines don't line up.
:-)  There's several more places like this in the patch.

Good eyes.

Matching the coding-style to have no SP between function name and
its argument list is just as important as matching the indentation
style used in the project; trading one breakage with another does
not make much sense.

Where exactly in Documentation/CodingGuidelines is the "indentation
style" used in the project specified that is being violated?

-- 
Felipe Contreras

On Wed, May 8, 2013 at 8:16 PM, Felipe Contreras
[off-list ref] wrote:

Cast the object to a commit, only to get the object back?

I'm dropping this one.

-- 
Felipe Contreras

On Thu, May 9, 2013 at 6:12 PM, Felipe Contreras
[off-list ref] wrote:

On Thu, May 9, 2013 at 6:09 PM, Junio C Hamano [off-list ref] wrote:

quoted

John Szakmeister [off-list ref] writes:

quoted

On Wed, May 8, 2013 at 9:16 PM, Felipe Contreras
[off-list ref] wrote:

quoted

Signed-off-by: Felipe Contreras <redacted>
---
 builtin/fast-export.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index d60d675..8091354 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c

@@ -135,7 +135,7 @@ static void export_blob(const unsigned char *sha1)

[snip]

quoted

@@ -289,13 +289,13 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
        parse_commit(commit);
        author = strstr(commit->buffer, "\nauthor ");
        if (!author)
-               die ("Could not find author in commit %s",
+               die("Could not find author in commit %s",
                     sha1_to_hex(commit->object.sha1));

It looks like your simple replace didn't account for calls with
multiple lines.  Now the remaining lines don't line up.
:-)  There's several more places like this in the patch.

Good eyes.

Matching the coding-style to have no SP between function name and
its argument list is just as important as matching the indentation
style used in the project; trading one breakage with another does
not make much sense.

Where exactly in Documentation/CodingGuidelines is the "indentation
style" used in the project specified that is being violated?

I find it extremely annoying that an obviously correct patch is not
merged because it's not conforming to a non-existing coding-style
guideline that not even the Linux project follows. I've sent many
patches where I change the alignment from cino=(0, to cino=(2s, and
the get applied because if it's not mentioned in
Documentation/CodingStyle, it cannot be used as a reason for
rejection.

I fixed the style so it conforms to Documentation/CodingGuidelines,
and nowhere in there is the open parenthesis alignment mentioned, so
using that as a reason to reject this patch is a mistake in my
opinion.

If you prefer the code to not follow Documentation/CodingGuidelines,
so be it. I'm not going to work on this patch any more.

-- 
Felipe Contreras