Merge branch 'maint-1.6.0' into maint

gitster · gitster · commit 78f111e12de4 · 2009-01-17T22:39:49.000-08:00
* maint-1.6.0:
  builtin-fsck: fix off by one head count
  Documentation: let asciidoc align related options
  githooks.txt: add missing word
  builtin-commit.c: do not remove COMMIT_EDITMSG
diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
@@ -21,7 +21,10 @@ OPTIONS
 -------
 include::diff-options.txt[]
 
--1 -2 -3 or --base --ours --theirs, and -0::
+-1 --base::
+-2 --ours::
+-3 --theirs::
+-0::
 	Diff against the "base" version, "our branch" or "their
 	branch" respectively.  With these options, diffs for
 	merged entries are not shown.
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
@@ -90,7 +90,7 @@ This hook is invoked by 'git-commit' right after preparing the
 default log message, and before the editor is started.
 
 It takes one to three parameters.  The first is the name of the file
-that the commit log message.  The second is the source of the commit
+that contains the commit log message.  The second is the source of the commit
 message, and can be: `message` (if a `-m` or `-F` option was
 given); `template` (if a `-t` option was given or the
 configuration option `commit.template` is set); `merge` (if the
diff --git a/builtin-commit.c b/builtin-commit.c
@@ -624,7 +624,6 @@ static int prepare_to_commit(const char *index_file, const char *prefix)
 	if (!commitable && !in_merge && !allow_empty &&
 	    !(amend && is_a_merge(head_sha1))) {
 		run_status(stdout, index_file, prefix, 0);
-		unlink(commit_editmsg);
 		return 0;
 	}
 
diff --git a/builtin-fsck.c b/builtin-fsck.c
@@ -628,7 +628,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 	}
 
 	heads = 0;
-	for (i = 1; i < argc; i++) {
+	for (i = 0; i < argc; i++) {
 		const char *arg = argv[i];
 		if (!get_sha1(arg, head_sha1)) {
 			struct object *obj = lookup_object(head_sha1);

Original file line number	Diff line number	Diff line change
`@@ -624,7 +624,6 @@ static int prepare_to_commit(const char index_file, const char prefix)`
`624`	`624`	`if (!commitable && !in_merge && !allow_empty &&`
`625`	`625`	`!(amend && is_a_merge(head_sha1))) {`
`626`	`626`	`run_status(stdout, index_file, prefix, 0);`
`627`		`- unlink(commit_editmsg);`
`628`	`627`	`return 0;`
`629`	`628`	`}`
`630`	`629`
Original file line number	Diff line number	Diff line change
`@@ -628,7 +628,7 @@ int cmd_fsck(int argc, const char *argv, const char prefix)`
`628`	`628`	`}`
`629`	`629`
`630`	`630`	`heads = 0;`
`631`		`- for (i = 1; i < argc; i++) {`
	`631`	`+ for (i = 0; i < argc; i++) {`
`632`	`632`	`const char *arg = argv[i];`
`633`	`633`	`if (!get_sha1(arg, head_sha1)) {`
`634`	`634`	`struct object *obj = lookup_object(head_sha1);`