undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fast-import: use pointer-to-pointer to keep list tail

Browse Source 
This is shorter, idiomatic, and it means the compiler does
not get confused about whether our "e" pointer is valid,
letting us drop the "e = e" hack.

Signed-off-by: Jeff King <peff@peff.net>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2013-03-21 07:08:17 -04:00 committed by Junio C Hamano
parent 1c71541ddd
commit 4db34cc134
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fast-import.c
View File

@ -2613,7 +2613,7 @@ static int parse_from(struct branch *b)
static struct hash_list *parse_merge(unsigned int *count) static struct hash_list *parse_merge(unsigned int *count)
{ {
struct hash_list *list = NULL, *n, *e = e; struct hash_list *list = NULL, **tail = &list, *n;
const char *from; const char *from;
struct branch *s; struct branch *s;
@ -2641,11 +2641,9 @@ static struct hash_list *parse_merge(unsigned int *count)
die("Invalid ref name or SHA1 expression: %s", from); die("Invalid ref name or SHA1 expression: %s", from);
n->next = NULL; n->next = NULL;
if (list) *tail = n;
e->next = n; tail = &n->next;
else
list = n;
e = n;
(*count)++; (*count)++;
read_next_command(); read_next_command();
} }