fast-export: use an unsorted string list for extra_refs

dscho · gitster · commit 2075ffb58e3a · 2008-11-23T19:54:51.000-08:00
The list extra_refs contains tags and the objects referenced by them,
so that they can be handled at the end.  When a tag references a
commit, that commit is added to the list using the same name.

Also, the function handle_tags_and_duplicates() relies on the order
the items were added to extra_refs, so clearly we do not want to
use a sorted list here.

Noticed by Miklos Vajna.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
Tested-by: Miklos Vajna &lt;vmiklos@frugalware.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin-fast-export.c b/builtin-fast-export.c
@@ -354,7 +354,7 @@ static void get_tags_and_duplicates(struct object_array *pending,
 		case OBJ_TAG:
 			tag = (struct tag *)e->item;
 			while (tag && tag->object.type == OBJ_TAG) {
-				string_list_insert(full_name, extra_refs)->util = tag;
+				string_list_append(full_name, extra_refs)->util = tag;
 				tag = (struct tag *)tag->tagged;
 			}
 			if (!tag)
@@ -374,7 +374,7 @@ static void get_tags_and_duplicates(struct object_array *pending,
 		}
 		if (commit->util)
 			/* more than one name for the same object */
-			string_list_insert(full_name, extra_refs)->util = commit;
+			string_list_append(full_name, extra_refs)->util = commit;
 		else
 			commit->util = full_name;
 	}
diff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh
@@ -231,7 +231,7 @@ test_expect_success 'fast-export -C -C | fast-import' '
 
 '
 
-test_expect_failure 'fast-export | fast-import when master is tagged' '
+test_expect_success 'fast-export | fast-import when master is tagged' '
 
 	git tag -m msg last &&
 	git fast-export -C -C --signed-tags=strip --all > output &&

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ static void get_tags_and_duplicates(struct object_array *pending,`
`354`	`354`	`case OBJ_TAG:`
`355`	`355`	`tag = (struct tag *)e->item;`
`356`	`356`	`while (tag && tag->object.type == OBJ_TAG) {`
`357`		`- string_list_insert(full_name, extra_refs)->util = tag;`
	`357`	`+ string_list_append(full_name, extra_refs)->util = tag;`
`358`	`358`	`tag = (struct tag *)tag->tagged;`
`359`	`359`	`}`
`360`	`360`	`if (!tag)`
`@@ -374,7 +374,7 @@ static void get_tags_and_duplicates(struct object_array *pending,`
`374`	`374`	`}`
`375`	`375`	`if (commit->util)`
`376`	`376`	`/* more than one name for the same object */`
`377`		`- string_list_insert(full_name, extra_refs)->util = commit;`
	`377`	`+ string_list_append(full_name, extra_refs)->util = commit;`
`378`	`378`	`else`
`379`	`379`	`commit->util = full_name;`
`380`	`380`	`}`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ test_expect_success 'fast-export -C -C \| fast-import' '`
`231`	`231`
`232`	`232`	`'`
`233`	`233`
`234`		`-test_expect_failure 'fast-export \| fast-import when master is tagged' '`
	`234`	`+test_expect_success 'fast-export \| fast-import when master is tagged' '`
`235`	`235`
`236`	`236`	`git tag -m msg last &&`
`237`	`237`	`git fast-export -C -C --signed-tags=strip --all > output &&`