git, branch v1.5.6.6

GIT 1.5.6.6

2008-12-17T06:13:36Z

Signed-off-by: Junio C Hamano

GIT 1.5.5.6

2008-12-17T06:08:28Z

Signed-off-by: Junio C Hamano

GIT 1.5.4.7

2008-12-17T06:06:47Z

Signed-off-by: Junio C Hamano

gitweb: do not run "git diff" that is Porcelain

2008-12-17T05:54:44Z

Jakub says that legacy-style URI to view two blob differences are never generated since 1.4.3. This codepath runs "git diff" Porcelain from the gitweb, which is a no-no. It can trigger diff.external command that is specified in the configuration file of the repository being viewed. This patch applies to v1.5.4 and later. Signed-off-by: Junio C Hamano

t5304-prune: adjust file mtime based on system time rather than file mtime

2008-08-14T01:18:23Z

test-chmtime can adjust the mtime of a file based on the file's mtime, or based on the system time. For files accessed over NFS, the file's mtime is set by the NFS server, and as such may vary a great deal from the NFS client's system time if the clocks of the client and server are out of sync. Since these tests are testing the expire feature of git-prune, an incorrect mtime could cause a file to be expired or not expired incorrectly and produce a test failure. Avoid this NFS pitfall by modifying the calls to test-chmtime so that the mtime is adjusted based on the system time, rather than the file's mtime. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

Fix escaping of glob special characters in pathspecs

2008-08-14T00:11:03Z

match_one implements an optimized pathspec match where it only uses fnmatch if it detects glob special characters in the pattern. Unfortunately it didn't treat \ as a special character, so attempts to escape a glob special character would fail even though fnmatch() supports it. Signed-off-by: Kevin Ballard Signed-off-by: Junio C Hamano

Do not talk about "diff" in rev-list documentation.

2008-08-13T05:40:44Z

Since 8c02eee (git-rev-list(1): group options; reformat; document more options, 2006-09-01), git-rev-list documentation talks as if it supports any kind of diff output. It doesn't. Signed-off-by: Junio C Hamano

git-bisect: fix wrong usage of read(1)

2008-08-11T23:48:11Z

Signed-off-by: Francis Moreau Signed-off-by: Junio C Hamano

Re-fix rev-list-options documentation

2008-08-11T21:24:51Z

18a2197 (Documentation: rev-list-options: Fix -g paragraph formatting, 2008-08-10) introduced the third paragraph that is continued, but it seems to confuse docbook toolchain on FC9 machines. Signed-off-by: Junio C Hamano

Documentation: fix invalid reference to 'mybranch' in user manual

2008-08-11T06:56:22Z

Signed-off-by: Ivan Stankovic Signed-off-by: Junio C Hamano