Merge branch 'ab/bundle'

* ab/bundle:
  Teach git-bundle to read revision arguments from stdin like git-rev-list.
This commit is contained in:
Junio C Hamano 2008-07-13 15:15:08 -07:00
commit ef567fe70a

View File

@ -178,6 +178,7 @@ int create_bundle(struct bundle_header *header, const char *path,
int i, ref_count = 0; int i, ref_count = 0;
char buffer[1024]; char buffer[1024];
struct rev_info revs; struct rev_info revs;
int read_from_stdin = 0;
struct child_process rls; struct child_process rls;
FILE *rls_fout; FILE *rls_fout;
@ -227,8 +228,16 @@ int create_bundle(struct bundle_header *header, const char *path,
/* write references */ /* write references */
argc = setup_revisions(argc, argv, &revs, NULL); argc = setup_revisions(argc, argv, &revs, NULL);
if (argc > 1)
return error("unrecognized argument: %s'", argv[1]); for (i = 1; i < argc; i++) {
if (!strcmp(argv[i], "--stdin")) {
if (read_from_stdin++)
die("--stdin given twice?");
read_revisions_from_stdin(&revs);
continue;
}
return error("unrecognized argument: %s'", argv[i]);
}
for (i = 0; i < revs.pending.nr; i++) { for (i = 0; i < revs.pending.nr; i++) {
struct object_array_entry *e = revs.pending.objects + i; struct object_array_entry *e = revs.pending.objects + i;