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

GIT 1.6.3.3

2009-06-22T04:15:50Z

Signed-off-by: Junio C Hamano

Merge branch 'ak/maint-for-each-ref-no-lookup' into maint

2009-06-22T04:15:39Z

* ak/maint-for-each-ref-no-lookup: for-each-ref: Do not lookup objects when they will not be used

Merge branch 'rc/maint-http-local-slot-fix' into maint

2009-06-22T04:15:31Z

* rc/maint-http-local-slot-fix: http*: cleanup slot->local after fclose

Merge branch 'cb/maint-no-double-merge' into maint

2009-06-22T04:15:27Z

* cb/maint-no-double-merge: refuse to merge during a merge

Merge branch 'mn/maint-iconv-autoconf' into maint

2009-06-22T04:14:25Z

* mn/maint-iconv-autoconf: fix handling of iconv configuration options

Merge branch 'lt/maint-unsigned-left-shift' into maint

2009-06-22T04:14:09Z

* lt/maint-unsigned-left-shift: Fix big left-shifts of unsigned char

Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint

2009-06-22T04:08:05Z

* pb/maint-1.6.2-userdiff-fix: upload-archive: fix infinite loop on Cygwin avoid exponential regex match for java and objc function names

attribute: whitespace set to true detects all errors known to git

2009-06-21T17:43:10Z

That is what the documentation says, but the code pretends as if all the known whitespace error tokens were given. Among the whitespace error tokens, there is one kind that loosens the rule when set: cr-at-eol. Which means that whitespace error token that is set to true ignores a newly introduced CR at the end, which is inconsistent with the documentation. Signed-off-by: Junio C Hamano

.gitattributes: CR at the end of the line is an error

2009-06-21T17:42:37Z

When a CR is accidentally added at the end of a C source file in the git project tree, "git diff --check" doesn't detect it as an error. $ echo abQ | tr Q '\015' >>fast-import.c $ git diff --check I think this is because the "whitespace" attribute is set to *.[ch] files without specifying what kind of errors are caught. It makes git "notice all types of errors" (as described in the documentation), but I think it is incorrectly setting cr-at-eol, too, and hides this error. Signed-off-by: Nanako Shiraishi Signed-off-by: Junio C Hamano

t3505: fix abuse of test_expect_code

2009-06-21T09:01:28Z

The test wanted to make sure that cherry-pick exits with status 1, but with the way it was placed after "git checkout master &&" meant that it could have misjudged success if checkout barfed with the same failure status. Signed-off-by: Junio C Hamano