git/builtin, branch v2.4.8

Merge branch 'ss/clone-guess-dir-name-simplify' into maint

2015-08-03T17:41:33Z

Code simplification. * ss/clone-guess-dir-name-simplify: clone: simplify string handling in guess_dir_name()

Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maint

2015-08-03T17:41:31Z

"git for-each-ref" reported "missing object" for 0{40} when it encounters a broken ref. The lack of object whose name is 0{40} is not the problem; the ref being broken is. * mh/reporting-broken-refs-from-for-each-ref: read_loose_refs(): treat NULL_SHA1 loose references as broken read_loose_refs(): simplify function logic for-each-ref: report broken references correctly t6301: new tests of for-each-ref error handling

Merge branch 'ls/hint-rev-list-count' into maint

2015-07-27T19:21:47Z

* ls/hint-rev-list-count: rev-list: add --count to usage guide

Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maint

2015-07-27T19:21:42Z

A minor bugfix when pack bitmap is used with "rev-list --count". * jk/rev-list-no-bitmap-while-pruning: rev-list: disable --use-bitmap-index when pruning commits

Merge branch 'jk/index-pack-reduce-recheck' into maint

2015-07-27T19:21:38Z

Disable "have we lost a race with competing repack?" check while receiving a huge object transfer that runs index-pack. * jk/index-pack-reduce-recheck: index-pack: avoid excessive re-reading of pack directory

Merge branch 'mh/fsck-reflog-entries' into maint

2015-07-15T18:41:19Z

"git fsck" used to ignore missing or invalid objects recorded in reflog. * mh/fsck-reflog-entries: fsck: report errors if reflog entries point at invalid objects fsck_handle_reflog_sha1(): new function

Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maint

2015-07-15T18:41:16Z

"git format-patch --ignore-if-upstream A..B" did not like to be fed tags as boundary commits. * jc/do-not-feed-tags-to-clear-commit-marks: format-patch: do not feed tags to clear_commit_marks()

clone: simplify string handling in guess_dir_name()

2015-07-09T21:21:29Z

Signed-off-by: Sebastian Schuberth Signed-off-by: Junio C Hamano

rev-list: disable --use-bitmap-index when pruning commits

2015-07-01T19:00:50Z

The reachability bitmaps do not have enough information to tell us which commits might have changed path "foo", so the current code produces wrong answers for: git rev-list --use-bitmap-index --count HEAD -- foo (it silently ignores the "foo" limiter). Instead, we should fall back to doing a normal traversal (it is OK to fall back rather than complain, because --use-bitmap-index is a pure optimization, and might not kick in for other reasons, such as there being no bitmaps in the repository). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

rev-list: add --count to usage guide

2015-07-01T16:29:11Z

--count should be mentioned in the usage guide, this updates code and documentation. Signed-off-by: Lawrence Siebert Signed-off-by: Junio C Hamano