git, branch v1.7.4-rc0

Git 1.7.4-rc0

2010-12-28T21:53:24Z

Signed-off-by: Junio C Hamano

Merge branch 'maint'

2010-12-28T21:50:11Z

* maint: Prepare for 1.7.3.5 Fix false positives in t3404 due to SHELL=/bin/false close file on error in read_mmfile() Conflicts: RelNotes

Prepare for 1.7.3.5

2010-12-28T21:48:54Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/commit-die-on-bogus-ident' into maint

2010-12-28T21:45:12Z

* jk/commit-die-on-bogus-ident: commit: die before asking to edit the log message ident: die on bogus date format

Merge branch 'ks/blame-worktree-textconv-cached' into maint

2010-12-28T21:44:58Z

* ks/blame-worktree-textconv-cached: fill_textconv(): Don't get/put cache if sha1 is not valid t/t8006: Demonstrate blame is broken when cachetextconv is on

Merge branch 'jc/maint-rebase-rewrite-last-skip' into maint

2010-12-28T21:43:10Z

* jc/maint-rebase-rewrite-last-skip: rebase --skip: correctly wrap-up when skipping the last patch

Merge branch 'jc/maint-am-abort-safely' into maint

2010-12-28T21:42:55Z

* jc/maint-am-abort-safely: am --abort: keep unrelated commits since the last failure and warn

Merge branch 'kb/maint-status-cquote' into maint

2010-12-28T21:23:20Z

* kb/maint-status-cquote: status: Quote paths with spaces in short format

t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'

2010-12-28T19:27:12Z

The '--no-chain-reply-to' option is a Getopt::Long boolean option. The '--no-' prefix (as in --no-chain-reply-to) for boolean options is not supported in Getopt::Long version 2.32 which was released with Perl 5.8.0. This version only supports '--no' as in '--nochain-reply-to'. More recent versions of Getopt::Long, such as version 2.34, support either prefix. So use the older form in the tests. See also: 907a0b1e04ea31cb368e9422df93d8ebb0187914 84eeb687de7a6c7c42af3fb51b176e0f412a979e 3fee1fe87144360a1913eab86af9ad136c810076 Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

Merge branch 'jc/maint-rebase-rewrite-last-skip'

2010-12-28T19:26:59Z

* jc/maint-rebase-rewrite-last-skip: rebase --skip: correctly wrap-up when skipping the last patch