git, branch v1.6.0-rc0

Merge branch 'ap/trackinfo'

2008-07-21T01:00:27Z

* ap/trackinfo: Reword "your branch has diverged..." lines to reduce line length

Merge branch 'jc/rerere-auto-more'

2008-07-21T01:00:17Z

* jc/rerere-auto-more: rerere.autoupdate: change the message when autoupdate is in effect

Merge branch 'ns/am-abort'

2008-07-21T01:00:13Z

* ns/am-abort: git am --abort

Merge branch 'jc/add-addremove'

2008-07-21T00:53:17Z

* jc/add-addremove: git-add --all: documentation git-add --all: tests git-add --all: add all files builtin-add.c: restructure the code for maintainability Conflicts: builtin-add.c

"needs update" considered harmful

2008-07-21T00:21:32Z

"git update-index --refresh", "git reset" and "git add --refresh" have reported paths that have local modifications as "needs update" since the beginning of git. Although this is logically correct in that you need to update the index at that path before you can commit that change, it is now becoming more and more clear, especially with the continuous push for user friendliness since 1.5.0 series, that the message is suboptimal. After all, the change may be something the user might want to get rid of, and "updating" would be absolutely a wrong thing to do if that is the case. I prepared two alternatives to solve this. Both aim to reword the message to more neutral "locally modified". This patch is a more intrusive variant that changes the message for only Porcelain commands ("add" and "reset") while keeping the plumbing "update-index" intact. Signed-off-by: Junio C Hamano

Move read_in_full() and write_in_full() to wrapper.c

2008-07-21T00:17:09Z

A few compat/* layer functions call these functions, but we would really want to keep them thin, without depending too much on the libgit proper. Signed-off-by: Junio C Hamano

Link shell with compat layer functions

2008-07-21T00:17:09Z

This in the short term will break on platforms that use compat implemenations that call outside compat layer, but that is exactly what we want. To give incentive to fix things for people who are affected and more importantly have environment to test their fixes. Signed-off-by: Junio C Hamano

Merge branch 'maint'

2008-07-21T00:16:29Z

* maint: fix usage string for git grep refresh-index: fix bitmask assignment Conflicts: builtin-grep.c

git-svn: fix git svn info to work without arguments

2008-07-20T22:16:50Z

commit 2fe403e7452bd6e1e8232445cf5434ce8f1af973 broke "git-svn info ." due to replacing '.' with '' in canonicalize_path for the top directory, while find_file_type_and_diff_status was not corrected. Bug reports: http://thread.gmane.org/gmane.comp.version-control.git/87822/ http://bugs.debian.org/490400 Signed-off-by: Dmitry Potapov Signed-off-by: Junio C Hamano

builtin-push.c: Cleanup - use OPT_BIT() and remove some variables

2008-07-20T21:41:49Z

Signed-off-by: Michele Ballabio Signed-off-by: Junio C Hamano