summaryrefslogtreecommitdiff
path: root/git-remote.perl
diff options
context:
space:
mode:
authorJohannes Sixt <johannes.sixt@telecom.at>2007-06-09 22:34:16 +0200
committerJunio C Hamano <gitster@pobox.com>2007-06-12 22:26:07 -0700
commit6718f1f0d07167128c2d23c15081ea5660e865e9 (patch)
treebbc59a319c21c35643d03ead494c00638c6a11ef /git-remote.perl
parent9a7d941056fcf6df8324097b73c78353174e4e1b (diff)
downloadgit-6718f1f0d07167128c2d23c15081ea5660e865e9.tar.gz
git-remote show: Also shorten non-fast-forward refs in the 'push' listing
'git-remote show remote-name' lists the refs that are pushed to the remote by showing the 'Push' line from the config file. But before showing it, it shortened 'refs/heads/here:refs/heads/there' to 'here:there'. However, if the Push line is prefixed with a plus, the ref was not shortened. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-remote.perl')
-rwxr-xr-xgit-remote.perl1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-remote.perl b/git-remote.perl
index 5763799127..b59cafdf87 100755
--- a/git-remote.perl
+++ b/git-remote.perl
@@ -258,6 +258,7 @@ sub show_remote {
if ($info->{'PUSH'}) {
my @pushed = map {
s|^refs/heads/||;
+ s|^\+refs/heads/|+|;
s|:refs/heads/|:|;
$_;
} @{$info->{'PUSH'}};