git, branch v1.8.1.6

Git 1.8.1.6

2013-04-07T15:58:30Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/directory-attrs-regression-fix' into maint-1.8.1

2013-04-07T15:45:03Z

A pattern "dir" (without trailing slash) in the attributes file stopped matching a directory "dir" by mistake with an earlier change that wanted to allow pattern "dir/" to also match. * jc/directory-attrs-regression-fix: t: check that a pattern without trailing slash matches a directory dir.c::match_pathname(): pay attention to the length of string parameters dir.c::match_pathname(): adjust patternlen when shifting pattern dir.c::match_basename(): pay attention to the length of string parameters attr.c::path_matches(): special case paths that end with a slash attr.c::path_matches(): the basename is part of the pathname

remote-helpers/test-bzr.sh: do not use "grep '\s'"

2013-04-07T15:41:34Z

Using grep "devel\s\+3:" to find at least one whitspace is not portable on all grep versions; not all grep versions understand "\s" as a "whitespace". Use a literal TAB followed by SPACE. The + as a qualifier for "one or more" is not a basic regular expression; use egrep instead of grep. Signed-off-by: Torsten Bögershausen Signed-off-by: Junio C Hamano

Start preparing for 1.8.1.6

2013-04-03T16:12:11Z

Signed-off-by: Junio C Hamano

Merge branch 'kb/name-hash' into maint-1.8.1

2013-04-03T15:44:54Z

* kb/name-hash: name-hash.c: fix endless loop with core.ignorecase=true

Merge branch 'kk/revwalk-slop-too-many-commit-within-a-second' into maint-1.8.1

2013-04-03T15:44:02Z

* kk/revwalk-slop-too-many-commit-within-a-second: Fix revision walk for commits with the same dates

Merge branch 'jk/checkout-attribute-lookup' into maint-1.8.1

2013-04-03T15:43:40Z

* jk/checkout-attribute-lookup: t2003: work around path mangling issue on Windows entry: fix filter lookup t2003: modernize style

Merge branch 'jk/fully-peeled-packed-ref' into maint-1.8.1

2013-04-03T15:43:03Z

* jk/fully-peeled-packed-ref: pack-refs: add fully-peeled trait pack-refs: write peeled entry for non-tags use parse_object_or_die instead of die("bad object") avoid segfaults on parse_object failure

Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint-1.8.1

2013-04-03T15:37:39Z

* ap/maint-diff-rename-avoid-overlap: tests: make sure rename pretty print works diff: prevent pprint_rename from underrunning input diff: Fix rename pretty-print when suffix and prefix overlap

Merge branch 'yd/doc-merge-annotated-tag' into maint-1.8.1

2013-04-03T15:36:52Z

* yd/doc-merge-annotated-tag: Documentation: merging a tag is a special case