delta/git.git/diffcore-rename.c, branch ks/prepare-commit-msg-sample-fix

Merge branch 'ab/free-and-null'

2017-06-24T21:28:41+00:00

A common pattern to free a piece of memory and assign NULL to the
pointer that used to point at it has been replaced with a new
FREE_AND_NULL() macro.

* ab/free-and-null:
  *.[ch] refactoring: make use of the FREE_AND_NULL() macro
  coccinelle: make use of the "expression" FREE_AND_NULL() rule
  coccinelle: add a rule to make "expression" code use FREE_AND_NULL()
  coccinelle: make use of the "type" FREE_AND_NULL() rule
  coccinelle: add a rule to make "type" code use FREE_AND_NULL()
  git-compat-util: add a FREE_AND_NULL() wrapper around free(ptr); ptr = NULL

coccinelle: make use of the "type" FREE_AND_NULL() rule

2017-06-16T19:44:03+00:00

Apply the result of the just-added coccinelle rule. This manually
excludes a few occurrences, mostly things that resulted in many
FREE_AND_NULL() on one line, that'll be manually fixed in a subsequent
change.

Signed-off-by: Ævar Arnfjörð Bjarmason 
Signed-off-by: Junio C Hamano

diffcore-rename: use is_empty_blob_oid

2017-06-05T02:23:58+00:00

Signed-off-by: Brandon Williams 
Signed-off-by: Junio C Hamano

diff: convert fill_filespec to struct object_id

2017-06-02T00:36:07+00:00

Signed-off-by: Brandon Williams 
Signed-off-by: Junio C Hamano

Merge branch 'tk/diffcore-delta-remove-unused'

2016-11-17T21:45:22+00:00

Code cleanup.

* tk/diffcore-delta-remove-unused:
  diffcore-delta: remove unused parameter to diffcore_count_changes()

diffcore-delta: remove unused parameter to diffcore_count_changes()

2016-11-14T17:24:04+00:00

The delta_limit parameter to diffcore_count_changes() has been unused
since commit ba23bbc8e ("diffcore-delta: make change counter to byte
oriented again.", 2006-03-04).

Remove the parameter and adjust all callers.

Signed-off-by: Tobias Klauser 
Signed-off-by: Junio C Hamano

use QSORT

2016-09-29T22:42:18+00:00

Apply the semantic patch contrib/coccinelle/qsort.cocci to the code
base, replacing calls of qsort(3) with QSORT.  The resulting code is
shorter and supports empty arrays with NULL pointers.

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

pass constants as first argument to st_mult()

2016-08-01T21:01:03+00:00

The result of st_mult() is the same no matter the order of its
arguments.  It invokes the macro unsigned_mult_overflows(), which
divides the second parameter by the first one.  Pass constants
first to allow that division to be done already at compile time.

Signed-off-by: Rene Scharfe 
Reviewed-by: Jeff King 
Signed-off-by: Junio C Hamano

diff: rename struct diff_filespec's sha1_valid member

2016-06-28T18:39:02+00:00

Now that this struct's sha1 member is called "oid", update the comment
and the sha1_valid member to be called "oid_valid" instead.  The
following Coccinelle semantic patch was used to implement this, followed
by the transformations in object_id.cocci:

@@
struct diff_filespec o;
@@
- o.sha1_valid
+ o.oid_valid

@@
struct diff_filespec *p;
@@
- p->sha1_valid
+ p->oid_valid

Signed-off-by: brian m. carlson 
Signed-off-by: Junio C Hamano

diff: convert struct diff_filespec to struct object_id

2016-06-28T18:39:02+00:00

Convert struct diff_filespec's sha1 member to use a struct object_id
called "oid" instead.  The following Coccinelle semantic patch was used
to implement this, followed by the transformations in object_id.cocci:

@@
struct diff_filespec o;
@@
- o.sha1
+ o.oid.hash

@@
struct diff_filespec *p;
@@
- p->sha1
+ p->oid.hash

Signed-off-by: brian m. carlson 
Signed-off-by: Junio C Hamano