diff options
| author | Julian Phillips <julian@quantumfyre.co.uk> | 2010-06-26 00:41:39 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-27 10:17:18 -0700 |
| commit | 0c72cead8435b2865efc884060bd0bd49313cbd5 (patch) | |
| tree | 85fe1fa29a3e80661746ca3d223bd016d0cb869e /builtin/fast-export.c | |
| parent | t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" script (diff) | |
| parent | string_list: Fix argument order for string_list_append (diff) | |
| download | git-0c72cead8435b2865efc884060bd0bd49313cbd5.tar.gz git-0c72cead8435b2865efc884060bd0bd49313cbd5.zip | |
Merge branch 'jp/string-list-api-cleanup' into jn/grep-open
An evil merge to adjust the series to cleaned-up API.
From: Julian Phillips <julian@quantumfyre.co.uk>
Subject: [PATCH v2 7/7] grep: fix string_list_append calls
Date: Sat, 26 Jun 2010 00:41:39 +0100
Message-ID: <20100625234140.18927.35025.julian@quantumfyre.co.uk>
* jp/string-list-api-cleanup:
string_list: Fix argument order for string_list_append
string_list: Fix argument order for string_list_lookup
string_list: Fix argument order for string_list_insert_at_index
string_list: Fix argument order for string_list_insert
string_list: Fix argument order for for_each_string_list
string_list: Fix argument order for print_string_list
Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/fast-export.c')
| -rw-r--r-- | builtin/fast-export.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/fast-export.c b/builtin/fast-export.c index c6dd71a7bc..9fe25ff0b3 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -438,7 +438,7 @@ static void get_tags_and_duplicates(struct object_array *pending, /* handle nested tags */ while (tag && tag->object.type == OBJ_TAG) { parse_object(tag->object.sha1); - string_list_append(full_name, extra_refs)->util = tag; + string_list_append(extra_refs, full_name)->util = tag; tag = (struct tag *)tag->tagged; } if (!tag) @@ -464,7 +464,7 @@ static void get_tags_and_duplicates(struct object_array *pending, } if (commit->util) /* more than one name for the same object */ - string_list_append(full_name, extra_refs)->util = commit; + string_list_append(extra_refs, full_name)->util = commit; else commit->util = full_name; } |