mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* rc/for-each-ref-tracking:
  for-each-ref: always check stat_tracking_info()'s return value
This commit is contained in:
Junio C Hamano
2015-01-14 12:39:02 -08:00
parent 63a0e83ea6 b6160d950c
commit 401a317aae
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/for-each-ref.c
View File

@ -717,7 +717,10 @@ static void populate_value(struct refinfo *ref)
starts_with(name, "upstream")) {
char buf[40];
stat_tracking_info(branch, &num_ours, &num_theirs);
if (stat_tracking_info(branch, &num_ours,
&num_theirs) != 1)
continue;
if (!num_ours && !num_theirs)
v->s = "";
else if (!num_ours) {
@ -735,7 +738,11 @@ static void populate_value(struct refinfo *ref)
} else if (!strcmp(formatp, "trackshort") &&
starts_with(name, "upstream")) {
assert(branch);
stat_tracking_info(branch, &num_ours, &num_theirs);
if (stat_tracking_info(branch, &num_ours,
&num_theirs) != 1)
continue;
if (!num_ours && !num_theirs)
v->s = "=";
else if (!num_ours)