user/sven/git.git/builtin-commit.c, branch v1.5.6.4

builtin-commit.c: Use 'git_config_string' to get 'commit.template'

2008-07-06T00:42:54Z

Signed-off-by: Brian Hetro Signed-off-by: Junio C Hamano

commit: drop duplicated parents

2008-06-03T06:55:57Z

The scripted version of git-commit internally used git-commit-tree which omitted duplicated parents given from the command line. This prevented a nonsensical octopus merge from getting created even when you said "git merge A B" while you are already on branch A. However, when git-commit was rewritten in C, this sanity check was lost. This resurrects it. Signed-off-by: Junio C Hamano

Merge 1.5.5.3 in

2008-05-28T05:34:19Z

commit --interactive: properly update the index before commiting

2008-05-28T05:32:47Z

When adding files through git commit --interactive, and 'quit' afterwards, the message in the editor of the commit message indicates that many (maybe all) files are deleted from the tree. Dismissing that and running git commit afterwards does the right thing. This commit fixes git commit --interactive to properly update the index before commiting. Reported by Jiří Paleček through http://bugs.debian.org/480429 Signed-off-by: Gerrit Pape Signed-off-by: Junio C Hamano

Merge branch 'js/config-cb'

2008-05-25T21:25:02Z

* js/config-cb: Provide git_config with a callback-data parameter Conflicts: builtin-add.c builtin-cat-file.c

Merge branch 'ar/add-unreadable'

2008-05-21T21:16:46Z

* ar/add-unreadable: Add a config option to ignore errors for git-add Add a test for git-add --ignore-errors Add --ignore-errors to git-add to allow it to skip files with read errors Extend interface of add_files_to_cache to allow ignore indexing errors Make the exit code of add_file_to_index actually useful

Merge branch 'sb/committer'

2008-05-14T20:45:20Z

* sb/committer: commit: Show committer if automatic commit: Show author if different from committer Preparation to call determine_author_info from prepare_to_commit

Provide git_config with a callback-data parameter

2008-05-14T19:34:44Z

git_config() only had a function parameter, but no callback data parameter. This assumes that all callback functions only modify global variables. With this patch, every callback gets a void * parameter, and it is hoped that this will help the libification effort. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Extend interface of add_files_to_cache to allow ignore indexing errors

2008-05-13T03:54:52Z

Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano

Make the exit code of add_file_to_index actually useful

2008-05-13T03:54:46Z

Update the programs which used the function (as add_file_to_cache). Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano