delta/git.git, branch jc/abbrev-autoscale-config

config.abbrev: document the new default that auto-scales

2016-12-22T21:17:15+00:00

We somehow forgot to update the "default is 7" in the
documentation.  Also give a way to explicitly ask the auto-scaling
by setting config.abbrev to "auto".

Signed-off-by: Junio C Hamano

A bit of updates post -rc0

2016-11-01T19:59:58+00:00

Signed-off-by: Junio C Hamano

Merge branch 'cc/split-index-typofix'

2016-11-01T19:58:49+00:00

Typofix in a comment in code

* cc/split-index-typofix:
  split-index: s/eith/with/ typo fix

Merge branch 'jk/no-looking-at-dotgit-outside-repo'

2016-11-01T19:58:49+00:00

A small code cleanup.

* jk/no-looking-at-dotgit-outside-repo:
  sha1_name: make wraparound of the index into ring-buffer explicit

Merge branch 'rs/cocci'

2016-11-01T19:58:49+00:00

Improve the rule to convert "unsigned char [20]" into "struct
object_id *" in contrib/coccinelle/

* rs/cocci:
  cocci: avoid self-references in object_id transformations

split-index: s/eith/with/ typo fix

2016-11-01T18:48:02+00:00

Signed-off-by: Christian Couder 
Signed-off-by: Junio C Hamano

cocci: avoid self-references in object_id transformations

2016-11-01T17:58:39+00:00

The object_id functions oid_to_hex, oid_to_hex_r, oidclr, oidcmp, and
oidcpy are defined as wrappers of their legacy counterparts sha1_to_hex,
sha1_to_hex_r, hashclr, hashcmp, and hashcpy, respectively.  Make sure
that the Coccinelle transformations for converting legacy function calls
are not applied to these wrappers themselves, which would result in
tautological declarations.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

sha1_name: make wraparound of the index into ring-buffer explicit

2016-11-01T17:56:39+00:00

Overflow is defined for unsigned integers, but not for signed ones.
Wrap around explicitly for the new ring-buffer in find_unique_abbrev()
as we did in bb84735c for the ones in sha1_to_hex() and get_pathname(),
thus avoiding signed overflows and getting rid of the magic number 3.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

Git 2.11-rc0

2016-10-31T20:19:53+00:00

Signed-off-by: Junio C Hamano

Merge branch 'nd/test-helpers'

2016-10-31T20:15:27+00:00

Update to the test framework made in 2.9 timeframe broke running
the tests under valgrind, which has been fixed.

* nd/test-helpers:
  valgrind: support test helpers