Browse Source

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  process_{tree,blob}: Remove useless xstrdup calls
maint
Junio C Hamano 16 years ago
parent
commit
f7af75777f
  1. 2
      list-objects.c
  2. 1
      reachable.c

2
list-objects.c

@ -23,7 +23,6 @@ static void process_blob(struct rev_info *revs,
if (obj->flags & (UNINTERESTING | SEEN)) if (obj->flags & (UNINTERESTING | SEEN))
return; return;
obj->flags |= SEEN; obj->flags |= SEEN;
name = xstrdup(name);
add_object(obj, p, path, name); add_object(obj, p, path, name);
} }


@ -78,7 +77,6 @@ static void process_tree(struct rev_info *revs,
if (parse_tree(tree) < 0) if (parse_tree(tree) < 0)
die("bad tree object %s", sha1_to_hex(obj->sha1)); die("bad tree object %s", sha1_to_hex(obj->sha1));
obj->flags |= SEEN; obj->flags |= SEEN;
name = xstrdup(name);
add_object(obj, p, path, name); add_object(obj, p, path, name);
me.up = path; me.up = path;
me.elem = name; me.elem = name;

1
reachable.c

@ -48,7 +48,6 @@ static void process_tree(struct tree *tree,
obj->flags |= SEEN; obj->flags |= SEEN;
if (parse_tree(tree) < 0) if (parse_tree(tree) < 0)
die("bad tree object %s", sha1_to_hex(obj->sha1)); die("bad tree object %s", sha1_to_hex(obj->sha1));
name = xstrdup(name);
add_object(obj, p, path, name); add_object(obj, p, path, name);
me.up = path; me.up = path;
me.elem = name; me.elem = name;

Loading…
Cancel
Save