summaryrefslogtreecommitdiff
path: root/bundle.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-03 14:59:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-11-20 23:10:29 (GMT)
commit8b3dce565084c89ceb19f7ccf0fe22ffd365f7fd (patch)
tree8af65ea645a32792642903fac65a4d776aa2408f /bundle.c
parent63d564b300274ec71a274f9b672366d07ae5620a (diff)
downloadgit-8b3dce565084c89ceb19f7ccf0fe22ffd365f7fd.zip
git-8b3dce565084c89ceb19f7ccf0fe22ffd365f7fd.tar.gz
git-8b3dce565084c89ceb19f7ccf0fe22ffd365f7fd.tar.bz2
Teach --stdin option to "log" family
Move the logic to read revs from standard input that rev-list knows about from it to revision machinery, so that all the users of setup_revisions() can feed the list of revs from the standard input when "--stdin" is used on the command line. Allow some users of the revision machinery that want different semantics from the "--stdin" option to disable it by setting an option in the rev_info structure. This also cleans up the kludge made to bundle.c via cut and paste. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'bundle.c')
-rw-r--r--bundle.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/bundle.c b/bundle.c
index df95e15..e04ab49 100644
--- a/bundle.c
+++ b/bundle.c
@@ -204,7 +204,6 @@ int create_bundle(struct bundle_header *header, const char *path,
int i, ref_count = 0;
char buffer[1024];
struct rev_info revs;
- int read_from_stdin = 0;
struct child_process rls;
FILE *rls_fout;
@@ -256,15 +255,8 @@ int create_bundle(struct bundle_header *header, const char *path,
/* write references */
argc = setup_revisions(argc, argv, &revs, NULL);
- 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]);
- }
+ if (argc > 1)
+ return error("unrecognized argument: %s'", argv[1]);
object_array_remove_duplicates(&revs.pending);