зеркало из https://github.com/microsoft/git.git
builtin-remote: Fix missing newline at end of listing of pushed branches
Without this the output of 'git remote show' does not end with a new-line: bash> git remote show repo * remote repo URL: repo.or.cz:/srv/git/kdbg.git Tracked remote branches maint master mob Local branch pushed with 'git push' +master:masterbash> Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
0c829391cf
Коммит
ec31b0ce98
|
@ -472,6 +472,7 @@ static int show_or_prune(int argc, const char **argv, int prune)
|
||||||
spec->dst ? ":" : "",
|
spec->dst ? ":" : "",
|
||||||
skip_prefix(spec->dst, "refs/heads/"));
|
skip_prefix(spec->dst, "refs/heads/"));
|
||||||
}
|
}
|
||||||
|
printf("\n");
|
||||||
}
|
}
|
||||||
cleanup_states:
|
cleanup_states:
|
||||||
/* NEEDSWORK: free remote */
|
/* NEEDSWORK: free remote */
|
||||||
|
|
|
@ -106,6 +106,8 @@ cat > test/expect << EOF
|
||||||
master
|
master
|
||||||
Tracked remote branches
|
Tracked remote branches
|
||||||
side master
|
side master
|
||||||
|
Local branches pushed with 'git push'
|
||||||
|
master:upstream +refs/tags/lastbackup
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
test_expect_success 'show' '
|
test_expect_success 'show' '
|
||||||
|
@ -118,6 +120,10 @@ test_expect_success 'show' '
|
||||||
echo 1 > file &&
|
echo 1 > file &&
|
||||||
test_tick &&
|
test_tick &&
|
||||||
git commit -m update file) &&
|
git commit -m update file) &&
|
||||||
|
git config remote.origin.push \
|
||||||
|
refs/heads/master:refs/heads/upstream &&
|
||||||
|
git config --add remote.origin.push \
|
||||||
|
+refs/tags/lastbackup &&
|
||||||
git remote show origin > output &&
|
git remote show origin > output &&
|
||||||
git diff expect output)
|
git diff expect output)
|
||||||
'
|
'
|
||||||
|
|
Загрузка…
Ссылка в новой задаче