git, branch v1.7.1-rc0

Git 1.7.1-rc0

2010-04-06T22:00:01Z

Signed-off-by: Junio C Hamano

Merge branch 'da/maint-python-startup'

2010-04-06T21:50:47Z

* da/maint-python-startup: Makefile: Remove usage of deprecated Python "has_key" method

Merge branch 'ic/bash-completion-rpm'

2010-04-06T21:50:47Z

* ic/bash-completion-rpm: RPM spec: include bash completion support

Merge branch 'sb/fmt-merge-msg'

2010-04-06T21:50:46Z

* sb/fmt-merge-msg: fmt-merge-msg: hide summary option fmt-merge-msg: remove custom string_list implementation string-list: add unsorted_string_list_lookup() fmt-merge-msg: use pretty.c routines t6200: test fmt-merge-msg more t6200: modernize with test_tick fmt-merge-msg: be quiet if nothing to merge

Merge branch 'jc/conflict-marker-size'

2010-04-06T21:50:46Z

* jc/conflict-marker-size: diff --check: honor conflict-marker-size attribute

Merge branch 'ef/maint-empty-commit-log'

2010-04-06T21:50:46Z

* ef/maint-empty-commit-log: rev-list: fix --pretty=oneline with empty message

Merge branch 'sg/bash-completion'

2010-04-06T21:50:45Z

* sg/bash-completion: bash: completion for gitk aliases bash: support user-supplied completion scripts for aliases bash: support user-supplied completion scripts for user's git commands bash: improve aliased command recognition

Revert "Link against libiconv on IRIX"

2010-04-05T17:16:11Z

Brandon Casey reports: Subject: Re: [PATCH] Link against libiconv on IRIX Date: Mon, 05 Apr 2010 11:45:32 -0500 Message-Id: <1UypQMCHLT57SnjSQIM66RTkLalsvavG8xXoQJv4rEQ@cipher.nrlssc.navy.mil> This breaks compilation on IRIX 6.5.29m for me since there is no separate libiconv.so. What version of IRIX are you using? On my system, even the iconv utility doesn't link against a libiconv shared object. It seems the iconv functionality is in libc. # ldd /usr/bin/iconv libc.so.1 => /usr/lib32/libc.so.1 Could it be that you are using a third party iconv library? I've experienced this on another system and the problem was related to curl. In that case, curl was linked against an external iconv and not the native library, so if I tried to build with curl support, I had to also build against the external iconv library. While we wait for an improved solution, revert the regression caused by 21704227904b51197976c61c595b52d807677533.

Merge branch 'maint'

2010-04-04T17:23:21Z

* maint: pack-protocol.txt: fix pkt-line lengths pack-protocol.txt: fix spelling

pack-protocol.txt: fix pkt-line lengths

2010-04-04T17:18:21Z

Previously, the lengths were 4-bytes short. Fix it such that the lengths reflect the total length of the pkt-line, as per spec. Signed-off-by: Tay Ray Chuan Signed-off-by: Junio C Hamano