git/contrib, branch v2.10.2

Merge branch 'jc/cocci-xstrdup-or-null' into maint

2016-10-28T16:01:23Z

Code cleanup. * jc/cocci-xstrdup-or-null: cocci: refactor common patterns to use xstrdup_or_null()

Merge branch 'rs/cocci' into maint

2016-10-28T16:01:23Z

Code cleanup. * rs/cocci: use strbuf_add_unique_abbrev() for adding short hashes, part 3 remove unnecessary NULL check before free(3) coccicheck: make transformation for strbuf_addf(sb, "...") more precise use strbuf_add_unique_abbrev() for adding short hashes, part 2 use strbuf_addstr() instead of strbuf_addf() with "%s", part 2 gitignore: ignore output files of coccicheck make target use strbuf_addstr() for adding constant strings to a strbuf, part 2 add coccicheck make target contrib/coccinelle: fix semantic patch for oid_to_hex_r()

cocci: refactor common patterns to use xstrdup_or_null()

2016-10-12T18:22:10Z

d64ea0f83b ("git-compat-util: add xstrdup_or_null helper", 2015-01-12) added a handy wrapper that allows us to get a duplicate of a string or NULL if the original is NULL, but a handful of codepath predate its introduction or just weren't aware of it. Signed-off-by: Junio C Hamano

Merge branch 'rs/copy-array' into maint

2016-10-11T21:18:32Z

Code cleanup. * rs/copy-array: use COPY_ARRAY add COPY_ARRAY

remove unnecessary NULL check before free(3)

2016-10-10T18:37:41Z

free(3) handles NULL pointers just fine. Add a semantic patch for removing unnecessary NULL checks before calling this function, and apply it on the code base. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

coccicheck: make transformation for strbuf_addf(sb, "...") more precise

2016-10-03T19:20:20Z

We can replace strbuf_addf() calls that just add a simple string with calls to strbuf_addstr() to make the intent clearer. We need to be careful if that string contains printf format specifications like %%, though, as a simple replacement would change the output. Add checks to the semantic patch to make sure we only perform the transformation if the second argument is a string constant (possibly translated) that doesn't contain any percent signs. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

use strbuf_add_unique_abbrev() for adding short hashes, part 2

2016-09-27T21:02:40Z

Call strbuf_add_unique_abbrev() to add abbreviated hashes to strbufs instead of taking detours through find_unique_abbrev() and its static buffer. This is shorter and a bit more efficient. 1eb47f167d65d1d305b9c196a1bb40eb96117cb1 already converted six cases, this patch covers three more. A semantic patch for Coccinelle is included for easier checking for new cases that might be introduced in the future. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

use strbuf_addstr() instead of strbuf_addf() with "%s", part 2

2016-09-27T21:02:40Z

Replace uses of strbuf_addf() for adding strings with more lightweight strbuf_addstr() calls. This is shorter and makes the intent clearer. bc57b9c0cc5a123365a922fa1831177e3fd607ed already converted three cases, this patch covers two more. A semantic patch for Coccinelle is included for easier checking for new cases that might be introduced in the future. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

gitignore: ignore output files of coccicheck make target

2016-09-27T21:02:19Z

Helped-by: Jakub Narębski Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

use COPY_ARRAY

2016-09-25T23:44:13Z

Add a semantic patch for converting certain calls of memcpy(3) to COPY_ARRAY() and apply that transformation to the code base. The result is shorter and safer code. For now only consider calls where source and destination have the same type, or in other words: easy cases. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano