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

Merge branch 'maint'

Browse Source 
* maint:
  fix segfault showing an empty remote
This commit is contained in:
Junio C Hamano 2009-05-28 22:50:23 -07:00
commit a9d29038a7
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin-remote.c
View File

@ -299,11 +299,11 @@ static int get_push_ref_states(const struct ref *remote_refs,
return 0; return 0;
local_refs = get_local_heads(); local_refs = get_local_heads();
ref = push_map = copy_ref_list(remote_refs); push_map = copy_ref_list(remote_refs);
while (ref->next)
ref = ref->next;
push_tail = &ref->next;
push_tail = &push_map;
while (*push_tail)
push_tail = &((*push_tail)->next);
match_refs(local_refs, push_map, &push_tail, remote->push_refspec_nr, match_refs(local_refs, push_map, &push_tail, remote->push_refspec_nr,
remote->push_refspec, MATCH_REFS_NONE); remote->push_refspec, MATCH_REFS_NONE);

10
t/t5505-remote.sh
View File

@ -494,5 +494,15 @@ test_expect_success 'remote prune to cause a dangling symref' '
grep "dangling symref" err grep "dangling symref" err
' '
test_expect_success 'show empty remote' '
test_create_repo empty &&
git clone empty empty-clone &&
(
cd empty-clone &&
git remote show origin
)
'
test_done test_done