Merge branch 'xx/trivial' into maint

* xx/trivial:
tag.c: whitespace breakages fix
Fix whitespace issue in object.c
t5505: add missing &&

diff --git a/object.c b/object.c
index 277b3ddba7dc5387cd97cb35c23d3358727898be..2eda53cc6144430f5fcf4b93e80fac9b9e147bfd 100644 (file)
--- a/object.c
+++ b/object.c
@@ -211,10 +211,10 @@ struct object_list *object_list_insert(struct object *item,
                                       struct object_list **list_p)
 {
        struct object_list *new_list = xmalloc(sizeof(struct object_list));
-        new_list->item = item;
-        new_list->next = *list_p;
-        *list_p = new_list;
-        return new_list;
+       new_list->item = item;
+       new_list->next = *list_p;
+       *list_p = new_list;
+       return new_list;
 }
 
 int object_list_contains(struct object_list *list, struct object *obj)

diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 4c498b1902e4b0c74ea8d6bfc039d583bcc4364e..5d1c66ea7166b0b4d631b681f344e0eefb84d899 100755 (executable)
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -435,7 +435,7 @@ test_expect_success 'update --prune' '
         git branch -m side2 side3) &&
        (cd test &&
         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 &&
         test_must_fail git rev-parse refs/remotes/origin/side2)
 '

diff --git a/tag.c b/tag.c
index 85607c219e25d63b0d1f3344649104c60f5b96e2..28641cf85a0d32357269129f0e8b92bb9e21f399 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -28,12 +28,12 @@ struct tag *lookup_tag(const unsigned char *sha1)
                return create_object(sha1, OBJ_TAG, alloc_tag_node());
        if (!obj->type)
                obj->type = OBJ_TAG;
-        if (obj->type != OBJ_TAG) {
-                error("Object %s is a %s, not a tag",
-                      sha1_to_hex(sha1), typename(obj->type));
-                return NULL;
-        }
-        return (struct tag *) obj;
+       if (obj->type != OBJ_TAG) {
+               error("Object %s is a %s, not a tag",
+                     sha1_to_hex(sha1), typename(obj->type));
+               return NULL;
+       }
+       return (struct tag *) obj;
 }
 
 static unsigned long parse_tag_date(const char *buf, const char *tail)