summaryrefslogtreecommitdiff
path: root/t/t5505-remote.sh
diff options
context:
space:
mode:
authorJay Soffian <jaysoffian@gmail.com>2009-02-25 03:32:23 -0500
committerJunio C Hamano <gitster@pobox.com>2009-02-27 15:19:09 -0800
commit3bd925636cd11400d1840b39d0d18b640f32bdd2 (patch)
treeeee7e3bc66561b3eae45e9441fdf7a51c9a8b48e /t/t5505-remote.sh
parentcca7c97e37719eaee1d31cdaf1e638d19ecd69e4 (diff)
downloadgit-3bd925636cd11400d1840b39d0d18b640f32bdd2.tar.gz
builtin-remote: fix two inconsistencies in the output of "show <remote>"
Remote and stale branches are emitted in alphabetical order, but new and tracked branches are not. So sort the latter to be consistent with the former. This also lets us use more efficient string_list_has_string() instead of unsorted_string_list_has_string(). "show <remote>" prunes symrefs, but "show <remote> -n" does not. Fix the latter to match the former. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5505-remote.sh')
-rwxr-xr-xt/t5505-remote.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index eb637184a0..a13d4b66d6 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -141,8 +141,8 @@ cat > test/expect << EOF
New remote branch (next fetch will store in remotes/origin)
master
Tracked remote branches
- side
master
+ side
Local branches pushed with 'git push'
master:upstream
+refs/tags/lastbackup