git, branch v1.4.2-rc3

GIT 1.4.2-rc3

2006-08-03T23:40:20Z

We ended up merging too many stuff after -rc2, so here is another round of release candidate. Non bugfixes will be queued to "next" from now on until a real 1.4.2 happens. Signed-off-by: Junio C Hamano

Documentation/git.txt: link git-svn and git-instaweb from the main page.

2006-08-03T23:28:24Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/sideband'

2006-08-03T23:02:14Z

* jc/sideband: sideband: do not use color, just say "remote:" fetch/clone: mark messages from remote side stand out.

sideband: do not use color, just say "remote:"

2006-08-03T23:01:58Z

... per suggestion by Andrew. Signed-off-by: Junio C Hamano

Show both blob names from "git diff blob1 blob2"

2006-08-03T21:41:53Z

Earlier we deliberately showed only blob1's name because showing both names labeled the output as a renaming patch. Now the output routine (namely, diff.c::resolve_rename_copy()) is taught not to use pathname comparison to tell if a filepair is a rename, we can safely do this change. Signed-off-by: Junio C Hamano

diff.c: do not use pathname comparison to tell renames

2006-08-03T21:41:53Z

The final output from diff used to compare pathnames between preimage and postimage to tell if the filepair is a rename/copy. By explicitly marking the filepair created by diffcore_rename(), the output routine, resolve_rename_copy(), does not have to do so anymore. This helps feeding a filepair that has different pathnames in one and two elements to the diff machinery (most notably, comparing two blobs). Signed-off-by: Junio C Hamano

Add a couple of subdirectory tests.

2006-08-03T21:41:29Z

We still have too few of them, but we have to start from somewhere. The general rule is to make tests easy to debug when run with -v (notice use of seemingly useless echo everywhere in the new tests). Signed-off-by: Junio C Hamano

read-tree: shadowed variable fix.

2006-08-03T20:44:09Z

Recent changes to built-ins broke committing from subdirectory, because the unused parameter "prefix" shadowed a global variable. Spotted by Jeff King. Signed-off-by: Junio C Hamano

fixed variable declaration in gitk

2006-08-03T20:21:07Z

Signed-off-by: Michael Signed-off-by: Junio C Hamano

Fix "git diff blob1 blob2" showing the diff in reverse.

2006-08-03T18:50:10Z

This was introduced by mistake when revision.c::add_pending_object() was modified to use object-array instead of object-list. Signed-off-by: Junio C Hamano