Merge branch 'jj/stash-reset-only-toplevel'

[thirdparty/git.git] / builtin / commit.c

diff --git a/builtin/commit.c b/builtin/commit.c
index ae7aaf6dc6835888e4fb55de8a135331ab05316e..e588bc6ad3c66c46ba904c14e39b325055209734 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -510,7 +510,7 @@ static int run_status(FILE *fp, const char *index_file, const char *prefix, int
        s->nowarn = nowarn;
        s->is_initial = get_oid(s->reference, &oid) ? 1 : 0;
        if (!s->is_initial)
-               hashcpy(s->sha1_commit, oid.hash);
+               oidcpy(&s->oid_commit, &oid);
        s->status_format = status_format;
        s->ignore_submodule_arg = ignore_submodule_arg;
 
@@ -1406,7 +1406,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
 
        s.is_initial = get_oid(s.reference, &oid) ? 1 : 0;
        if (!s.is_initial)
-               hashcpy(s.sha1_commit, oid.hash);
+               oidcpy(&s.oid_commit, &oid);
 
        s.ignore_submodule_arg = ignore_submodule_arg;
        s.status_format = status_format;