git/builtin, branch v2.5.2

Sync with 2.4.9

2015-09-04T17:43:23Z

Sync with 2.3.9

2015-09-04T17:34:19Z

Sync with 2.2.3

2015-09-04T17:29:28Z

show-branch: use a strbuf for reflog descriptions

2015-09-04T16:48:26Z

When we show "branch@{0}", we format into a fixed-size buffer using sprintf. This can overflow if you have long branch names. We can fix it by using a temporary strbuf. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update' into maint

2015-09-04T02:18:02Z

When re-priming the cache-tree opportunistically while committing the in-core index as-is, we mistakenly invalidated the in-core index too aggressively, causing the experimental split-index code to unnecessarily rewrite the on-disk index file(s). * dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update: commit: don't rewrite shared index unnecessarily

Merge branch 'jc/calloc-pathspec' into maint

2015-09-04T02:18:00Z

Minor code cleanup. * jc/calloc-pathspec: ps_matched: xcalloc() takes nmemb and then element size

Merge branch 'jk/rev-list-has-no-notes' into maint

2015-09-04T02:17:53Z

"git rev-list" does not take "--notes" option, but did not complain when one is given. * jk/rev-list-has-no-notes: rev-list: make it obvious that we do not support notes

Merge branch 'mh/get-remote-group-fix' into maint

2015-09-04T02:17:48Z

An off-by-one error made "git remote" to mishandle a remote with a single letter nickname. * mh/get-remote-group-fix: get_remote_group(): use skip_prefix() get_remote_group(): eliminate superfluous call to strcspn() get_remote_group(): rename local variable "space" to "wordlen" get_remote_group(): handle remotes with single-character names

commit: don't rewrite shared index unnecessarily

2015-08-31T15:41:07Z

Remove a cache invalidation which would cause the shared index to be rewritten on as-is commits. When the cache-tree has changed, we need to update it. But we don't necessarily need to update the shared index. So setting active_cache_changed to SOMETHING_CHANGED is unnecessary. Instead, we let update_main_cache_tree just update the CACHE_TREE_CHANGED bit. In order to test this, make test-dump-split-index not segfault on missing replace_bitmap/delete_bitmap. This new codepath is not called now that the test passes, but is necessary to avoid a segfault when the new test is run with the old builtin/commit.c code. Signed-off-by: David Turner Acked-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Merge branch 'jk/guess-repo-name-regression-fix' into maint

2015-08-25T23:09:17Z

"git clone $URL" in recent releases of Git contains a regression in the code that invents a new repository name incorrectly based on the $URL. This has been corrected. * jk/guess-repo-name-regression-fix: clone: use computed length in guess_dir_name clone: add tests for output directory