git/builtin, branch v2.3.8

Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3

2015-05-11T21:33:59Z

The default $HOME/.gitconfig file created upon "git config --global" that edits it had incorrectly spelled user.name and user.email entries in it. * oh/fix-config-default-user-name-section: config: fix settings in default_user_config template

config: fix settings in default_user_config template

2015-04-17T17:32:46Z

The name (not user) and email setting should be in config section "user" and not in "core" as documented in Documentation/config.txt. Signed-off-by: Ossi Herrala Reviewed-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'jc/report-path-error-to-dir' into maint

2015-03-31T21:53:08Z

Code clean-up. * jc/report-path-error-to-dir: report_path_error(): move to dir.c

Merge branch 'ws/grep-quiet-no-pager' into maint

2015-03-28T16:33:11Z

Even though "git grep --quiet" is run merely to ask for the exit status, we spawned the pager regardless. Stop doing that. * ws/grep-quiet-no-pager: grep: fix "--quiet" overwriting current output

Merge branch 'jk/cleanup-failed-clone' into maint

2015-03-28T16:33:09Z

An failure early in the "git clone" that started creating the working tree and repository could have resulted in some directories and files left without getting cleaned up. * jk/cleanup-failed-clone: clone: drop period from end of die_errno message clone: initialize atexit cleanup handler earlier

Merge branch 'jk/prune-with-corrupt-refs' into maint

2015-03-28T16:33:06Z

"git prune" used to largely ignore broken refs when deciding which objects are still being used, which could spread an existing small damage and make it a larger one. * jk/prune-with-corrupt-refs: refs.c: drop curate_packed_refs repack: turn on "ref paranoia" when doing a destructive repack prune: turn on ref_paranoia flag refs: introduce a "ref paranoia" flag t5312: test object deletion code paths in a corrupted repository

Merge branch 'jk/tag-h-column-is-a-listing-option' into maint

2015-03-27T20:00:23Z

"git tag -h" used to show the "--column" and "--sort" options that are about listing in a wrong section. * jk/tag-h-column-is-a-listing-option: tag: fix some mis-organized options in "-h" listing

report_path_error(): move to dir.c

2015-03-24T21:12:10Z

The expected call sequence is for the caller to use match_pathspec() repeatedly on a set of pathspecs, accumulating the "hits" in a separate array, and then call this function to diagnose a pathspec that never matched anything, as that can indicate a typo from the command line, e.g. "git commit Maekfile". Many builtin commands use this function from builtin/ls-files.c, which is not a very healthy arrangement. ls-files might have been the first command to feel the need for such a helper, but the need is shared by everybody who uses the "match and then report" pattern. Move it to dir.c where match_pathspec() is defined. Signed-off-by: Junio C Hamano

Merge branch 'rs/deflate-init-cleanup' into maint

2015-03-23T18:23:38Z

Code simplification. * rs/deflate-init-cleanup: zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}

repack: turn on "ref paranoia" when doing a destructive repack

2015-03-20T19:41:38Z

If we are repacking with "-ad", we will drop any unreachable objects. Likewise, using "-Ad --unpack-unreachable=" will drop any old, unreachable objects. In these cases, we want to make sure the reachability we compute with "--all" is complete. We can do this by passing GIT_REF_PARANOIA=1 in the environment to pack-objects. Note that "-Ad" is safe already, because it only loosens unreachable objects. It is up to "git prune" to avoid deleting them. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano