Merge branch 'maint-1.6.1' into maint
* maint-1.6.1: process_{tree,blob}: Remove useless xstrdup calls
This commit is contained in:
commit
0122cf6611
@ -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;
|
||||||
|
@ -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…
Reference in New Issue
Block a user