git, branch v1.6.1-rc2

Point "stale" 1.6.0.5 documentation from the main git documentation page

2008-12-08T01:34:14Z

Signed-off-by: Junio C Hamano

Revert "git-stash: use git rev-parse -q"

2008-12-08T01:30:35Z

This reverts commit 757c7f60a78004fc3d0ea62f44320d54ef430c10 as an unnecessary error message to pop up when the last stash entry is dropped. It simply is not worth the aggravation.

Update draft release notes for 1.6.1

2008-12-07T23:14:26Z

A handful of fixes have been backmerged to 'maint' and are now contained in 1.6.0.X series as the result, so drop them from this document. Also contains typofix and duplicate removal pointed out by Bjørn Lindeijer and Jakub Narebski. Signed-off-by: Junio C Hamano

Merge branch 'maint'

2008-12-07T23:13:02Z

* maint: GIT 1.6.0.5 "git diff {3,}": do not reverse order of arguments tag: delete TAG_EDITMSG only on successful tag gitweb: Make project specific override for 'grep' feature work http.c: use 'git_config_string' to get 'curl_http_proxy' fetch-pack: Avoid memcpy() with src==dst

GIT 1.6.0.5

2008-12-07T23:11:54Z

Signed-off-by: Junio C Hamano

"git diff {3,}": do not reverse order of arguments

2008-12-07T22:57:57Z

According to the message of commit 0fe7c1de16f71312e6adac4b85bddf0d62a47168, "git diff" with three or more trees expects the merged tree first followed by the parents, in order. However, this command reversed the order of its arguments, resulting in confusing diffs. A comment /* Again, the revs are all reverse */ suggested there was a reason for this, but I can't figure out the reason, so I removed the reversal of the arguments. Test case included. Signed-off-by: Matt McCutchen Signed-off-by: Shawn O. Pearce

tag: delete TAG_EDITMSG only on successful tag

2008-12-07T10:53:45Z

The user may put some effort into writing an annotated tag message. When the tagging process later fails (which can happen fairly easily, since it may be dependent on gpg being correctly configured and used), there is no record left on disk of the tag message. Instead, let's keep the TAG_EDITMSG file around until we are sure the tag has been created successfully. If we die because of an error, the user can recover their text from that file. Leaving the file in place causes no conflicts; it will be silently overwritten by the next annotated tag creation. This matches the behavior of COMMIT_EDITMSG, which stays around in case of error. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

gitweb: Make project specific override for 'grep' feature work

2008-12-07T10:52:37Z

The 'grep' feature was marked in the comments as having project specific config, but it lacked 'sub' key required for it to work. Kind-of-Noticed-by: Matt Kraai Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano

http.c: use 'git_config_string' to get 'curl_http_proxy'

2008-12-07T10:41:55Z

Signed-off-by: Miklos Vajna Signed-off-by: Junio C Hamano

fetch-pack: Avoid memcpy() with src==dst

2008-12-07T10:41:45Z

memcpy() may only be used for disjoint memory areas, but when invoked from cmd_fetch_pack(), we have my_args == &args. (The argument cannot be removed entirely because transport.c invokes with its own variable.) Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano