Revert "builtin/commit-graph.c: support '--input=none'"

This reverts commit d203885,
to give it the chance to be reworked.

Author: gitster

Documentation/git-commit-graph.txt

@@ -39,7 +39,7 @@ COMMANDS
 --------
 'write'::
 
-Write a commit-graph file based on the specified sources of input:
+Write a commit-graph file based on the commits found in packfiles.
 +
 With the `--input=stdin-packs` option, generate the new commit graph by
 walking objects only in the specified pack-indexes. (Cannot be combined
@@ -57,12 +57,6 @@ walking commits starting at all refs. (Cannot be combined with
 With the `--input=append` option, include all commits that are present
 in the existing commit-graph file.
 +
-With the `--input=none` option, behave as if `--input=append` were
-given, but do not walk other packs to find additional commits.
-+
-If none of the above options are given, then generate the new
-commit-graph by walking over all pack-indexes.
-+
 With the `--split[=<strategy>]` option, write the commit-graph as a
 chain of multiple commit-graph files stored in
 `<dir>/info/commit-graphs`. Commit-graph layers are merged based on the

builtin/commit-graph.c

@@ -11,7 +11,7 @@ static char const * const builtin_commit_graph_usage[] = {
 	N_("git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"),
 	N_("git commit-graph write [--object-dir <objdir>] "
 	   "[--split[=<strategy>]] "
-	   "[--input=<reachable|stdin-packs|stdin-commits|append|none>] "
+	   "[--input=<reachable|stdin-packs|stdin-commits|append>] "
 	   "[--[no-]progress] <split options>"),
 	NULL
 };
@@ -24,7 +24,7 @@ static const char * const builtin_commit_graph_verify_usage[] = {
 static const char * const builtin_commit_graph_write_usage[] = {
 	N_("git commit-graph write [--object-dir <objdir>] "
 	   "[--split[=<strategy>]] "
-	   "[--input=<reachable|stdin-packs|stdin-commits|append|none>] "
+	   "[--input=<reachable|stdin-packs|stdin-commits|append>] "
 	   "[--[no-]progress] <split options>"),
 	NULL
 };
@@ -33,8 +33,7 @@ enum commit_graph_input {
 	COMMIT_GRAPH_INPUT_REACHABLE     = (1 << 1),
 	COMMIT_GRAPH_INPUT_STDIN_PACKS   = (1 << 2),
 	COMMIT_GRAPH_INPUT_STDIN_COMMITS = (1 << 3),
-	COMMIT_GRAPH_INPUT_APPEND        = (1 << 4),
-	COMMIT_GRAPH_INPUT_NONE          = (1 << 5)
+	COMMIT_GRAPH_INPUT_APPEND        = (1 << 4)
 };
 
 static struct opts_commit_graph {
@@ -84,8 +83,6 @@ static int option_parse_input(const struct option *opt, const char *arg,
 		*to |= COMMIT_GRAPH_INPUT_STDIN_COMMITS;
 	else if (!strcmp(arg, "append"))
 		*to |= COMMIT_GRAPH_INPUT_APPEND;
-	else if (!strcmp(arg, "none"))
-		*to |= (COMMIT_GRAPH_INPUT_APPEND | COMMIT_GRAPH_INPUT_NONE);
 	else
 		die(_("unrecognized --input source, %s"), arg);
 	return 0;
@@ -231,8 +228,6 @@ static int graph_write(int argc, const char **argv)
 		opts.obj_dir = get_object_directory();
 	if (opts.input & COMMIT_GRAPH_INPUT_APPEND)
 		flags |= COMMIT_GRAPH_WRITE_APPEND;
-	if (opts.input & COMMIT_GRAPH_INPUT_NONE)
-		flags |= COMMIT_GRAPH_WRITE_NO_INPUT;
 	if (opts.split)
 		flags |= COMMIT_GRAPH_WRITE_SPLIT;
 	if (opts.progress)

commit-graph.c

@@ -788,8 +788,7 @@ struct write_commit_graph_context {
 	unsigned append:1,
 		 report_progress:1,
 		 split:1,
-		 check_oids:1,
-		 no_input:1;
+		 check_oids:1;
 
 	const struct split_commit_graph_opts *split_opts;
 };
@@ -1782,7 +1781,6 @@ int write_commit_graph(struct object_directory *odb,
 	ctx->split = flags & COMMIT_GRAPH_WRITE_SPLIT ? 1 : 0;
 	ctx->check_oids = flags & COMMIT_GRAPH_WRITE_CHECK_OIDS ? 1 : 0;
 	ctx->split_opts = split_opts;
-	ctx->no_input = flags & COMMIT_GRAPH_WRITE_NO_INPUT ? 1 : 0;
 
 	if (ctx->split) {
 		struct commit_graph *g;
@@ -1841,7 +1839,7 @@ int write_commit_graph(struct object_directory *odb,
 			goto cleanup;
 	}
 
-	if (!ctx->no_input && !pack_indexes && !commit_hex)
+	if (!pack_indexes && !commit_hex)
 		fill_oids_from_all_packs(ctx);
 
 	close_reachable(ctx);

commit-graph.h

@@ -79,8 +79,7 @@ enum commit_graph_write_flags {
 	COMMIT_GRAPH_WRITE_PROGRESS   = (1 << 1),
 	COMMIT_GRAPH_WRITE_SPLIT      = (1 << 2),
 	/* Make sure that each OID in the input is a valid commit OID. */
-	COMMIT_GRAPH_WRITE_CHECK_OIDS = (1 << 3),
-	COMMIT_GRAPH_WRITE_NO_INPUT   = (1 << 4)
+	COMMIT_GRAPH_WRITE_CHECK_OIDS = (1 << 3)
 };
 
 enum commit_graph_split_flags {

t/t5324-split-commit-graph.sh

@@ -376,30 +376,4 @@ test_expect_success '--split=no-merge always writes an incremental' '
 	test_line_count = 2 $graphdir/commit-graph-chain
 '
 
-test_expect_success '--split=no-merge, --input=none writes nothing' '
-	test_when_finished rm -rf a graphs.before graphs.after &&
-	rm -rf $graphdir &&
-	git reset --hard commits/2 &&
-	git rev-list -1 HEAD~1 >a &&
-	git commit-graph write --split=no-merge --input=stdin-commits <a &&
-	ls $graphdir/graph-*.graph >graphs.before &&
-	test_line_count = 1 $graphdir/commit-graph-chain &&
-	git commit-graph write --split --input=none &&
-	ls $graphdir/graph-*.graph >graphs.after &&
-	test_cmp graphs.before graphs.after
-'
-
-test_expect_success '--split=merge-all, --input=none merges the chain' '
-	test_when_finished rm -rf a b &&
-	rm -rf $graphdir &&
-	git reset --hard commits/2 &&
-	git rev-list -1 HEAD~1 >a &&
-	git rev-list -1 HEAD >b &&
-	git commit-graph write --split=no-merge --input=stdin-commits <a &&
-	git commit-graph write --split=no-merge --input=stdin-commits <b &&
-	test_line_count = 2 $graphdir/commit-graph-chain &&
-	git commit-graph write --split=merge-all --input=none &&
-	test_line_count = 1 $graphdir/commit-graph-chain
-'
-
 test_done