user/sven/git.git, branch v1.5.4.4

GIT 1.5.4.4

2008-03-09T03:43:21Z

Signed-off-by: Junio C Hamano

ident.c: reword error message when the user name cannot be determined

2008-03-09T03:43:21Z

The "config --global" suggested in the message is a valid one-shot fix, and hopefully one-shot across machines that NFS mounts the home directories. This knowledge can hopefully be reused when you are forced to use git on Windows, but the fix based on GECOS would not be applicable, so it is not such a useful hint to mention the exact reason why the name cannot be determined. Signed-off-by: Santi Béjar Signed-off-by: Junio C Hamano

Fix dcommit, rebase when rewriteRoot is in use

2008-03-09T03:20:06Z

When the rewriteRoot setting is used with git-svn, it causes the svn IDs added to commit messages to bear a different URL than is actually used to retrieve Subversion data. It is common for Subversion repositories to be available multiple ways: for instance, HTTP to the public, and svn+ssh to people with commit access. The need to switch URLs for access is fairly common as well -- perhaps someone was just given commit access. To switch URLs without having to rewrite history, one can use the old url as a rewriteRoot, and use the new one in the svn-remote url setting. This works well for svn fetching and general git commands. However, git-svn dcommit, rebase, and perhaps other commands do not work in this scenario. They scan the svn ID lines in commit messages and attempt to match them up with url lines in [svn-remote] sections in the git config. This patch allows them to match rewriteRoot options, if such options are present. Signed-off-by: John Goerzen Acked-by: Eric Wong

Really make the LF after reset in fast-import optional

2008-03-08T18:46:10Z

cmd_from() ends with a call to read_next_command(), which is needed when using cmd_from() from commands where from is not the last element. With reset, however, "from" is the last command, after which the flow returns to the main loop, which calls read_next_command() again. Because of this, always set unread_command_buf in cmd_reset_branch(), even if cmd_from() was successful. Add a test case for this in t9300-fast-import.sh. Signed-off-by: Adeodato Simó Acked-by: Shawn O. Pearce Signed-off-by: Junio C Hamano

Merge branch 'mh/maint-http-proxy-fix' into maint

2008-03-08T10:20:37Z

* mh/maint-http-proxy-fix: Set proxy override with http_init()

Merge branch 'js/maint-daemon' into maint

2008-03-08T10:20:30Z

* js/maint-daemon: daemon: ensure that base-path is an existing directory daemon: send more error messages to the syslog

Merge branch 'js/maint-cvsexport' into maint

2008-03-08T10:13:52Z

* js/maint-cvsexport: cvsexportcommit: be graceful when "cvs status" reorders the arguments Conflicts: t/t9200-git-cvsexportcommit.sh

Merge branch 'jc/maint-log-merge-left-right' into maint

2008-03-08T10:11:37Z

* jc/maint-log-merge-left-right: Fix "git log --merge --left-right"

Merge branch 'ew/maint-svn-cert-fileprovider' into maint

2008-03-08T10:11:32Z

* ew/maint-svn-cert-fileprovider: git-svn: Don't prompt for client cert password everytime.

unquote_c_style: fix off-by-one.

2008-03-07T21:31:30Z

The optional endp parameter to unquote_c_style() was supposed to point at a location past the closing double quote, but it was going one beyond it. git-fast-import used this function heavily and the bug caused it to misparse the input stream, especially when parsing a rename command: R "filename that needs quoting" rename-target-name Because the function erroneously ate the whitespace after the closing dq, this triggered "Missing space after source" error when it shouldn't. Thanks to Adeodato Simò for having caught this. Signed-off-by: Pierre Habouzit Signed-off-by: Junio C Hamano