git/builtin-commit.c, branch v1.6.3.1

Merge branch 'maint-1.6.1' into maint

2009-04-05T08:04:54Z

* maint-1.6.1: commit: abort commit if interactive add failed git-repack: use non-dashed update-server-info

Merge branch 'maint-1.6.0' into maint-1.6.1

2009-04-05T08:04:38Z

* maint-1.6.0: commit: abort commit if interactive add failed git-repack: use non-dashed update-server-info Conflicts: builtin-commit.c

commit: abort commit if interactive add failed

2009-04-05T07:37:32Z

Previously we ignored the result of calling add_interactive, which meant that if an error occurred we simply committed whatever happened to be in the index. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Generalize and libify index_is_dirty() to index_differs_from(...)

2009-02-11T06:25:39Z

index_is_dirty() in builtin-revert.c checks if the index is dirty. This patch generalizes this function to check if the index differs from a revision, i.e. the former index_is_dirty() behavior can now be achieved by index_differs_from("HEAD", 0). The second argument "diff_flags" allows to set further diff option flags like DIFF_OPT_IGNORE_SUBMODULES. See DIFF_OPT_* macros in diff.h for a list. index_differs_from() seems to be useful for more than builtin-revert.c, so it is moved into diff-lib.c and also used in builtin-commit.c. Yet to mention: - "rev.abbrev = 0;" can be safely removed. This has no impact on performance or functioning of neither setup_revisions() nor run_diff_index(). - rev.pending.objects is free()d because this fixes a leak. (Also see 295dd2ad "Fix memory leak in traverse_commit_list") Mentored-by: Daniel Barkalow Mentored-by: Christian Couder Signed-off-by: Stephan Beyer Signed-off-by: Junio C Hamano

Merge branch 'mh/maint-commit-color-status' into maint

2009-01-29T07:42:53Z

* mh/maint-commit-color-status: git-status -v: color diff output when color.ui is set git-commit: color status output when color.ui is set

Merge branch 'cb/add-pathspec'

2009-01-26T01:13:11Z

* cb/add-pathspec: remove pathspec_match, use match_pathspec instead clean up pathspec matching

Merge branch 'sb/hook-cleanup'

2009-01-22T00:50:43Z

* sb/hook-cleanup: run_hook(): allow more than 9 hook arguments run_hook(): check the executability of the hook before filling argv api-run-command.txt: talk about run_hook() Move run_hook() from builtin-commit.c into run-command.c (libgit) checkout: don't crash on file checkout before running post-checkout hook

commit: more compact summary and without extra quotes

2009-01-20T06:38:06Z

Update the report format again to save the screen real estates, while avoiding from enclosing the one-line summary of the commit log inside double quotes pair, which looks awkward when the message begins or ends with a double quote. The old format looked like this: [master]: created d9a5491: "foo:bar" Simply removing the double quotes were found to be confusing as a message often begins with a short-word (area of the system) and a colon. The new format looks like this: [master d9a5491] foo:bar As discussed in the git mailing list: http://thread.gmane.org/gmane.comp.version-control.git/101687/focus=101735 Signed-off-by: Santi Béjar Signed-off-by: Junio C Hamano

Merge branch 'mh/maint-commit-color-status'

2009-01-18T07:05:19Z

* mh/maint-commit-color-status: git-status -v: color diff output when color.ui is set git-commit: color status output when color.ui is set

Merge branch 'maint-1.6.0' into maint

2009-01-18T06:39:49Z

* 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