git, branch v1.4.2

GIT 1.4.2

2006-08-13T01:32:58Z

Merge git://git.kernel.org/pub/scm/gitk/gitk

2006-08-13T01:32:17Z

* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Show the currently checked-out head in bold font gitk: Allow the user to set some colors

t/t4013: fix futzing with the version string.

2006-08-13T01:11:10Z

Signed-off-by: Junio C Hamano

Better error message when we are unable to lock the index file

2006-08-13T00:08:25Z

Most of the callers except the one in refs.c use the function to update the index file. Among the index writers, everybody except write-tree dies if they cannot open it for writing. This gives the function an extra argument, to tell it to die when it cannot create a new file as the lockfile. The only caller that does not have to die is write-tree, because updating the index for the cache-tree part is optional and not being able to do so does not affect the correctness. I think we do not have to be so careful and make the failure into die() the same way as other callers, but that would be a different patch. Signed-off-by: Junio C Hamano

git-am: give better diagnostics when the patch does not apply during --3way

2006-08-13T00:08:07Z

If the user tries to apply a patch that was hand-edited in such a way that it does not apply to the original file recorded on its "index" line anymore, we did detect the situation but did not issue an error message that is specific enough. Signed-off-by: Junio C Hamano

Merge branch 'rj/header'

2006-08-12T23:09:19Z

* rj/header: Fix header breakage with _XOPEN_SOURCE.

git-svn: split the path from the url correctly with limited perms

2006-08-12T06:55:21Z

This version of the splitter (that only affects SVN:: library users) works when one only has limited read-permissions to the repository they're fetching from. Updated from the original patch to workaround some SVN bug somewhere, which only seems to happen against file:// repositories... Here's the diff against the original patch I submitted: @@ -1159,8 +1159,8 @@ sub repo_path_split { } if ($_use_lib) { - $SVN = libsvn_connect($full_url); - my $url = $SVN->get_repos_root; + my $tmp = libsvn_connect($full_url); + my $url = $tmp->get_repos_root; $full_url =~ s#^\Q$url\E/*##; push @repo_path_split_cache, qr/^(\Q$url\E)/; return ($url, $full_url); Somehow connecting to a repository with the full url makes the returned SVN::Ra object act strangely and break things, so now we just drop the SVN::Ra object that we made our initial connection with. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano

git-sh-setup: do not use repo-config to test the git directory

2006-08-12T01:52:43Z

Since repo-config does not fail in non-git directory, it is not a good command to use to test the git-ness nor validate the repository revision of $GIT_DIR. Original patch by Robert Shearman but with minor fixes. Signed-off-by: Junio C Hamano

git-svn: bugfix: allow SVN:: lib users to track the root of the repository

2006-08-11T23:21:51Z

I'm not sure if anybody has hit this (besides me), but this fixes the problem where I ran into while attempting to import a small repo at the root level: I ended up with all the commits, but with no file/tree changes at all throughout the entire history. Also, fix a warning if the commit message is not defined for revision 0. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano

git-svn: correctly kill keyword expansion without munging EOLs

2006-08-11T23:16:40Z

This bugfix applies to users of the svn command-line client only. We no longer muck with newlines when killing keyword expansion. This tended to generate unintended diffs in commits because svn revert -R would destroy the manual EOL changes we were doing. Of course, we didn't need the EOL munging in the first place, as svn seems to do it for us even in the text-base files. Now we set the mtime and atime the files changed by keyword expansion killing to avoid triggering a change on svn revert, which svn still seems to want to do. Thanks to Seth Falcon for reporting this bug. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano