development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 03:29:21 +00:00
Code Issues 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
Show stats 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)

13
t/t6300-for-each-ref.sh
View file

@ -334,6 +334,19 @@ test_expect_success 'Check that :track[short] cannot be used with other atoms' '
test_must_fail git for-each-ref --format="%(refname:trackshort)" 2>/dev/null
'
test_expect_success 'Check that :track[short] works when upstream is invalid' '
cat >expected <<-\EOF &&
EOF
test_when_finished "git config branch.master.merge refs/heads/master" &&
git config branch.master.merge refs/heads/does-not-exist &&
git for-each-ref \
--format="%(upstream:track)$LF%(upstream:trackshort)" \
refs/heads >actual &&
test_cmp expected actual
'
cat >expected <<EOF
$(git rev-parse --short HEAD)
EOF