Merge branch 'maint'
* maint: tag.c: whitespace breakages fix Fix whitespace issue in object.c t5505: add missing &&
This commit is contained in:
commit
4682693e9c
8
object.c
8
object.c
@ -211,10 +211,10 @@ struct object_list *object_list_insert(struct object *item,
|
|||||||
struct object_list **list_p)
|
struct object_list **list_p)
|
||||||
{
|
{
|
||||||
struct object_list *new_list = xmalloc(sizeof(struct object_list));
|
struct object_list *new_list = xmalloc(sizeof(struct object_list));
|
||||||
new_list->item = item;
|
new_list->item = item;
|
||||||
new_list->next = *list_p;
|
new_list->next = *list_p;
|
||||||
*list_p = new_list;
|
*list_p = new_list;
|
||||||
return new_list;
|
return new_list;
|
||||||
}
|
}
|
||||||
|
|
||||||
int object_list_contains(struct object_list *list, struct object *obj)
|
int object_list_contains(struct object_list *list, struct object *obj)
|
||||||
|
@ -435,7 +435,7 @@ test_expect_success 'update --prune' '
|
|||||||
git branch -m side2 side3) &&
|
git branch -m side2 side3) &&
|
||||||
(cd test &&
|
(cd test &&
|
||||||
git remote update --prune &&
|
git remote update --prune &&
|
||||||
(cd ../one && git branch -m side3 side2)
|
(cd ../one && git branch -m side3 side2) &&
|
||||||
git rev-parse refs/remotes/origin/side3 &&
|
git rev-parse refs/remotes/origin/side3 &&
|
||||||
test_must_fail git rev-parse refs/remotes/origin/side2)
|
test_must_fail git rev-parse refs/remotes/origin/side2)
|
||||||
'
|
'
|
||||||
|
12
tag.c
12
tag.c
@ -28,12 +28,12 @@ struct tag *lookup_tag(const unsigned char *sha1)
|
|||||||
return create_object(sha1, OBJ_TAG, alloc_tag_node());
|
return create_object(sha1, OBJ_TAG, alloc_tag_node());
|
||||||
if (!obj->type)
|
if (!obj->type)
|
||||||
obj->type = OBJ_TAG;
|
obj->type = OBJ_TAG;
|
||||||
if (obj->type != OBJ_TAG) {
|
if (obj->type != OBJ_TAG) {
|
||||||
error("Object %s is a %s, not a tag",
|
error("Object %s is a %s, not a tag",
|
||||||
sha1_to_hex(sha1), typename(obj->type));
|
sha1_to_hex(sha1), typename(obj->type));
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
return (struct tag *) obj;
|
return (struct tag *) obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned long parse_tag_date(const char *buf, const char *tail)
|
static unsigned long parse_tag_date(const char *buf, const char *tail)
|
||||||
|
Loading…
Reference in New Issue
Block a user