summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-06 07:12:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-06 07:12:04 (GMT)
commit4682693e9ccc04252d0fad6f5627fc056abcdbba (patch)
treecfd7ed7e969a2f461d24a111187613cb9ba87f9a
parent02377cf4bc6050cdbf600ce65114a5438b049763 (diff)
parentaf24059fa299f1656692f5807eddd3b30b5f3cfb (diff)
downloadgit-4682693e9ccc04252d0fad6f5627fc056abcdbba.zip
git-4682693e9ccc04252d0fad6f5627fc056abcdbba.tar.gz
git-4682693e9ccc04252d0fad6f5627fc056abcdbba.tar.bz2
Merge branch 'maint'v1.7.3-rc0
* maint: tag.c: whitespace breakages fix Fix whitespace issue in object.c t5505: add missing &&
-rw-r--r--object.c8
-rwxr-xr-xt/t5505-remote.sh2
-rw-r--r--tag.c12
3 files changed, 11 insertions, 11 deletions
diff --git a/object.c b/object.c
index 7adfda7..7e1f2bb 100644
--- 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 4c498b1..5d1c66e 100755
--- 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 85607c2..28641cf 100644
--- 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)