commit-graph: error out on invalid commit oids in 'write --stdin-commits'

While 'git commit-graph write --stdin-commits' expects commit object
ids as input, it accepts and silently skips over any invalid commit
object ids, and still exits with success:

# nonsense
$ echo not-a-commit-oid | git commit-graph write --stdin-commits
$ echo $?
0
# sometimes I forgot that refs are not good...
$ echo HEAD | git commit-graph write --stdin-commits
$ echo $?
0
# valid tree OID, but not a commit OID
$ git rev-parse HEAD^{tree} | git commit-graph write --stdin-commits
$ echo $?
0
$ ls -l .git/objects/info/commit-graph
ls: cannot access '.git/objects/info/commit-graph': No such file or directory

Check that all input records are indeed valid commit object ids and
return with error otherwise, the same way '--stdin-packs' handles
invalid input; see e103f7276f (commit-graph: return with errors during
write, 2019-06-12).

Note that it should only return with error when encountering an
invalid commit object id coming from standard input.  However,
'--reachable' uses the same code path to process object ids pointed to
by all refs, and that includes tag object ids as well, which should
still be skipped over.  Therefore add a new flag to 'enum
commit_graph_write_flags' and a corresponding field to 'struct
write_commit_graph_context', so we can differentiate between those two
cases.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Acked-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index 64eccde314e57e76dac091a3da0347a4474c23ac..57863619b71dc9d33ff864b2ce39c6e3a7d6559b 100644 (file)
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -213,8 +213,10 @@ static int graph_write(int argc, const char **argv)
 
                if (opts.stdin_packs)
                        pack_indexes = &lines;
 
                if (opts.stdin_packs)
                        pack_indexes = &lines;

-               if (opts.stdin_commits)
+               if (opts.stdin_commits) {

                        commit_hex = &lines;
                        commit_hex = &lines;

+                       flags |= COMMIT_GRAPH_WRITE_CHECK_OIDS;
+               }

 
                UNLEAK(buf);
        }
 
                UNLEAK(buf);
        }

diff --git a/commit-graph.c b/commit-graph.c
index 04324a464894e930173b7bb0bbea9cf264c0d316..821900675b27f20f7a1480328f46c53fed97957c 100644 (file)
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -782,7 +782,8 @@ struct write_commit_graph_context {
 
        unsigned append:1,
                 report_progress:1,
 
        unsigned append:1,
                 report_progress:1,

-                split:1;
+                split:1,
+                check_oids:1;

 
        const struct split_commit_graph_opts *split_opts;
 };
 
        const struct split_commit_graph_opts *split_opts;
 };


@@ -1193,8 +1194,8 @@ static int fill_oids_from_packs(struct write_commit_graph_context *ctx,
        return 0;
 }
 
        return 0;
 }
 

-static void fill_oids_from_commit_hex(struct write_commit_graph_context *ctx,
-                                     struct string_list *commit_hex)
+static int fill_oids_from_commit_hex(struct write_commit_graph_context *ctx,
+                                    struct string_list *commit_hex)

 {
        uint32_t i;
        struct strbuf progress_title = STRBUF_INIT;
 {
        uint32_t i;
        struct strbuf progress_title = STRBUF_INIT;


@@ -1215,20 +1216,21 @@ static void fill_oids_from_commit_hex(struct write_commit_graph_context *ctx,
                struct commit *result;
 
                display_progress(ctx->progress, i + 1);
                struct commit *result;
 
                display_progress(ctx->progress, i + 1);

-               if (commit_hex->items[i].string &&
-                   parse_oid_hex(commit_hex->items[i].string, &oid, &end))
-                       continue;
-
-               result = lookup_commit_reference_gently(ctx->r, &oid, 1);
-
-               if (result) {
+               if (!parse_oid_hex(commit_hex->items[i].string, &oid, &end) &&
+                   (result = lookup_commit_reference_gently(ctx->r, &oid, 1))) {

                        ALLOC_GROW(ctx->oids.list, ctx->oids.nr + 1, ctx->oids.alloc);
                        oidcpy(&ctx->oids.list[ctx->oids.nr], &(result->object.oid));
                        ctx->oids.nr++;
                        ALLOC_GROW(ctx->oids.list, ctx->oids.nr + 1, ctx->oids.alloc);
                        oidcpy(&ctx->oids.list[ctx->oids.nr], &(result->object.oid));
                        ctx->oids.nr++;

+               } else if (ctx->check_oids) {
+                       error(_("invalid commit object id: %s"),
+                           commit_hex->items[i].string);
+                       return -1;

                }
        }
        stop_progress(&ctx->progress);
        strbuf_release(&progress_title);
                }
        }
        stop_progress(&ctx->progress);
        strbuf_release(&progress_title);

+
+       return 0;

 }
 
 static void fill_oids_from_all_packs(struct write_commit_graph_context *ctx)
 }
 
 static void fill_oids_from_all_packs(struct write_commit_graph_context *ctx)


@@ -1775,6 +1777,7 @@ int write_commit_graph(const char *obj_dir,
        ctx->append = flags & COMMIT_GRAPH_WRITE_APPEND ? 1 : 0;
        ctx->report_progress = flags & COMMIT_GRAPH_WRITE_PROGRESS ? 1 : 0;
        ctx->split = flags & COMMIT_GRAPH_WRITE_SPLIT ? 1 : 0;
        ctx->append = flags & COMMIT_GRAPH_WRITE_APPEND ? 1 : 0;
        ctx->report_progress = flags & COMMIT_GRAPH_WRITE_PROGRESS ? 1 : 0;
        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;
 
        if (ctx->split) {
        ctx->split_opts = split_opts;
 
        if (ctx->split) {


@@ -1829,8 +1832,10 @@ int write_commit_graph(const char *obj_dir,
                        goto cleanup;
        }
 
                        goto cleanup;
        }
 

-       if (commit_hex)
-               fill_oids_from_commit_hex(ctx, commit_hex);
+       if (commit_hex) {
+               if ((res = fill_oids_from_commit_hex(ctx, commit_hex)))
+                       goto cleanup;
+       }

 
        if (!pack_indexes && !commit_hex)
                fill_oids_from_all_packs(ctx);
 
        if (!pack_indexes && !commit_hex)
                fill_oids_from_all_packs(ctx);

diff --git a/commit-graph.h b/commit-graph.h
index ae4db87fb5e6dcaac185ae43204fad7dc90a55bd..486e64e591d476635c86e58518ccb3392c507e0c 100644 (file)
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -74,7 +74,9 @@ int generation_numbers_enabled(struct repository *r);
 enum commit_graph_write_flags {
        COMMIT_GRAPH_WRITE_APPEND     = (1 << 0),
        COMMIT_GRAPH_WRITE_PROGRESS   = (1 << 1),
 enum commit_graph_write_flags {
        COMMIT_GRAPH_WRITE_APPEND     = (1 << 0),
        COMMIT_GRAPH_WRITE_PROGRESS   = (1 << 1),

-       COMMIT_GRAPH_WRITE_SPLIT      = (1 << 2)
+       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)

 };
 
 struct split_commit_graph_opts {
 };
 
 struct split_commit_graph_opts {

diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
index 4391007f4c1c60fe7d66249a8190c6ea0f317eb8..ab3eccf0fafa3f8e9158b6347a544a8b4202b7ce 100755 (executable)
--- a/t/t5318-commit-graph.sh
+++ b/t/t5318-commit-graph.sh
@@ -23,7 +23,7 @@ test_expect_success 'write graph with no packs' '
        test_path_is_missing info/commit-graph
 '
 
        test_path_is_missing info/commit-graph
 '
 

-test_expect_success 'close with correct error on bad input' '
+test_expect_success 'exit with correct error on bad input to --stdin-packs' '

        cd "$TRASH_DIRECTORY/full" &&
        echo doesnotexist >in &&
        test_expect_code 1 git commit-graph write --stdin-packs <in 2>stderr &&
        cd "$TRASH_DIRECTORY/full" &&
        echo doesnotexist >in &&
        test_expect_code 1 git commit-graph write --stdin-packs <in 2>stderr &&


@@ -40,6 +40,15 @@ test_expect_success 'create commits and repack' '
        git repack
 '
 
        git repack
 '
 

+test_expect_success 'exit with correct error on bad input to --stdin-commits' '
+       cd "$TRASH_DIRECTORY/full" &&
+       echo HEAD | test_expect_code 1 git commit-graph write --stdin-commits 2>stderr &&
+       test_i18ngrep "invalid commit object id" stderr &&
+       # valid tree OID, but not a commit OID
+       git rev-parse HEAD^{tree} | test_expect_code 1 git commit-graph write --stdin-commits 2>stderr &&
+       test_i18ngrep "invalid commit object id" stderr
+'
+

 graph_git_two_modes() {
        git -c core.commitGraph=true $1 >output
        git -c core.commitGraph=false $1 >expect
 graph_git_two_modes() {
        git -c core.commitGraph=true $1 >output
        git -c core.commitGraph=false $1 >expect