X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=bundle.c;h=0ba5df17e15d679b03fe38af40260c118c9588fa;hb=c149184;hp=5c95eca07d19a6d3ed4e9000b5bb47eef90ff66e;hpb=f1a8cc635455a65567d040349327b9ea4adb479b;p=git.git

diff --git a/bundle.c b/bundle.c
index 5c95eca07..0ba5df17e 100644
--- a/bundle.c
+++ b/bundle.c
@@ -128,7 +128,8 @@ int verify_bundle(struct bundle_header *header, int verbose)
 		add_object_array(e->item, e->name, &refs);
 	}
 
-	prepare_revision_walk(&revs);
+	if (prepare_revision_walk(&revs))
+		die("revision walk setup failed");
 
 	i = req_nr;
 	while (i && (commit = get_revision(&revs)))
@@ -332,10 +333,12 @@ int create_bundle(struct bundle_header *header, const char *path,
 		write_or_die(rls.in, sha1_to_hex(object->sha1), 40);
 		write_or_die(rls.in, "\n", 1);
 	}
+	close(rls.in);
 	if (finish_command(&rls))
 		return error ("pack-objects died");
-
-	return bundle_to_stdout ? close(bundle_fd) : commit_lock_file(&lock);
+	if (!bundle_to_stdout)
+		commit_lock_file(&lock);
+	return 0;
 }
 
 int unbundle(struct bundle_header *header, int bundle_fd)