git/builtin, branch v2.3.0

Merge branch 'ak/cat-file-clean-up'

2015-01-22T21:46:38Z

* ak/cat-file-clean-up: cat-file: use "type" and "size" from outer scope

Merge branch 'ak/show-branch-usage-string'

2015-01-21T00:16:09Z

* ak/show-branch-usage-string: show-branch: fix indentation of usage string

show-branch: fix indentation of usage string

2015-01-21T00:12:54Z

Noticed-by: Jean-Noël Avila Signed-off-by: Ralf Thielow Signed-off-by: Junio C Hamano

Merge branch 'rc/for-each-ref-tracking'

2015-01-14T20:39:02Z

* rc/for-each-ref-tracking: for-each-ref: always check stat_tracking_info()'s return value

Merge branch 'ak/fewer-includes'

2015-01-14T20:37:19Z

* ak/fewer-includes: cat-file: remove unused includes git.c: remove unnecessary #includes

Merge branch 'ak/show-branch-usage-string'

2015-01-14T20:37:07Z

* ak/show-branch-usage-string: show-branch: line-wrap show-branch usage

Merge branch 'km/log-usage-string-i18n'

2015-01-14T20:32:39Z

* km/log-usage-string-i18n: log.c: fix translation markings

Merge branch 'js/remote-add-with-insteadof'

2015-01-14T20:29:47Z

"git remote add $name $URL" is now allowed when "url.$URL.insteadOf" is already defined. * js/remote-add-with-insteadof: Add a regression test for 'git remote add

' git remote: allow adding remotes agreeing with url.<...>.insteadOf

cat-file: use "type" and "size" from outer scope

2015-01-13T20:36:04Z

In cat_one_file(), "type" and "size" variables are defined in the function scope, and then two variables of the same name are defined in a block in one of the if/else statement, hiding the definitions in the outer scope. Because the values of the outer variables before the control enters this scope, however, do not have to be preserved, we can remove useless definitions of variables from the inner scope safely without breaking anything. Signed-off-by: Alexander Kuleshov Signed-off-by: Junio C Hamano

for-each-ref: always check stat_tracking_info()'s return value

2015-01-12T23:10:46Z

The code handling %(upstream:track) and %(upstream:trackshort) assumed that it always had a valid branch that had been sanitized earlier in populate_value(), and thus did not check the return value of the call to stat_tracking_info(). While there is indeed some sanitization code that basically corresponds to stat_tracking_info() returning 0 (no base branch set), the function can also return -1 when the base branch did exist but has since then been deleted. In this case, num_ours and num_theirs had undefined values and a call to `git for-each-ref --format="%(upstream:track)"` could print spurious values such as [behind -111794512] [ahead 38881640, behind 5103867] even for repositories with one single commit. Verify stat_tracking_info()'s return value and do not print anything if it returns -1. This behavior also matches the documentation ("has no effect if the ref does not have tracking information associated with it"). Helped-by: Eric Sunshine Helped-by: Jeff King Signed-off-by: Raphael Kubo da Costa Signed-off-by: Junio C Hamano