delta/git.git, branch ep/commit-static-buf-cleanup

builtin/commit.c: switch to strbuf, instead of snprintf()

2017-01-31T18:09:00+00:00

Switch to dynamic allocation with strbuf, so we can avoid dealing
with magic numbers in the code and reduce the cognitive burden from
the programmers.  The original code is correct, but programmers no
longer have to count bytes needed for static allocation to know that.

As a side effect of this change, we also reduce the snprintf()
calls, that may silently truncate results if the programmer is not
careful.

Helped-by: René Scharfe 
Helped-by: Junio C Hamano 
Helped-by: Jeff King 
Signed-off-by: Elia Pinto 
Signed-off-by: Junio C Hamano

builtin/commit.c: remove the PATH_MAX limitation via dynamic allocation

2017-01-13T19:22:18+00:00

Remove the PATH_MAX limitation from the environment setting that
points to a filename by switching to dynamic allocation.

As a side effect of this change, we also reduce the snprintf()
calls, that may silently truncate results if the programmer is not
careful.

Helped-by: Junio C Hamano 
Helped-by: Jeff King 
Signed-off-by: Elia Pinto 
Signed-off-by: Junio C Hamano

Fifth batch 2.12

2017-01-10T23:25:46+00:00

Signed-off-by: Junio C Hamano

Merge branch 'sb/submodule-embed-gitdir'

2017-01-10T23:24:28+00:00

A new submodule helper "git submodule embedgitdirs" to make it
easier to move embedded .git/ directory for submodules in a
superproject to .git/modules/ (and point the latter with the former
that is turned into a "gitdir:" file) has been added.

* sb/submodule-embed-gitdir:
  worktree: initialize return value for submodule_uses_worktrees
  submodule: add absorb-git-dir function
  move connect_work_tree_and_git_dir to dir.h
  worktree: check if a submodule uses worktrees
  test-lib-functions.sh: teach test_commit -C 
  submodule helper: support super prefix
  submodule: use absolute path for computing relative path connecting

Merge branch 'jc/retire-compaction-heuristics'

2017-01-10T23:24:27+00:00

"git diff" and its family had two experimental heuristics to shift
the contents of a hunk to make the patch easier to read.  One of
them turns out to be better than the other, so leave only the
"--indent-heuristic" option and remove the other one.

* jc/retire-compaction-heuristics:
  diff: retire "compaction" heuristics

Merge branch 'nd/config-misc-fixes'

2017-01-10T23:24:27+00:00

Leakage of lockfiles in the config subsystem has been fixed.

* nd/config-misc-fixes:
  config.c: handle lock file in error case in git_config_rename_...
  config.c: rename label unlock_and_out
  config.c: handle error case for fstat() calls

Merge branch 'jc/abbrev-autoscale-config'

2017-01-10T23:24:26+00:00

Recent update to the default abbreviation length that auto-scales
lacked documentation update, which has been corrected.

* jc/abbrev-autoscale-config:
  config.abbrev: document the new default that auto-scales

Merge branch 'mh/fast-import-notes-fix-new'

2017-01-10T23:24:26+00:00

"git fast-import" sometimes mishandled while rebalancing notes
tree, which has been fixed.

* mh/fast-import-notes-fix-new:
  fast-import: properly fanout notes when tree is imported

Merge branch 'jc/git-open-cloexec'

2017-01-10T23:24:26+00:00

The codeflow of setting NOATIME and CLOEXEC on file descriptors Git
opens has been simplified.
We may want to drop the tip one, but we'll see.

* jc/git-open-cloexec:
  sha1_file: stop opening files with O_NOATIME
  git_open_cloexec(): use fcntl(2) w/ FD_CLOEXEC fallback
  git_open(): untangle possible NOATIME and CLOEXEC interactions

Merge branch 'jc/compression-config'

2017-01-10T23:24:25+00:00

Compression setting for producing packfiles were spread across
three codepaths, one of which did not honor any configuration.
Unify these so that all of them honor core.compression and
pack.compression variables the same way.

* jc/compression-config:
  compression: unify pack.compression configuration parsing