diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit.c | 3 | ||||
| -rw-r--r-- | builtin/merge-ours.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index e89bf35634..91b1920255 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -908,7 +908,8 @@ static int prepare_to_commit(const char *index_file, const char *prefix, if (ignore_submodule_arg && !strcmp(ignore_submodule_arg, "all")) flags.ignore_submodules = 1; - committable = index_differs_from(parent, &flags, 1); + committable = index_differs_from(the_repository, + parent, &flags, 1); } } strbuf_release(&committer_ident); diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c index c84c6e05e9..0b07263415 100644 --- a/builtin/merge-ours.c +++ b/builtin/merge-ours.c @@ -26,7 +26,7 @@ int cmd_merge_ours(int argc, const char **argv, const char *prefix) */ if (read_cache() < 0) die_errno("read_cache failed"); - if (index_differs_from("HEAD", NULL, 0)) + if (index_differs_from(the_repository, "HEAD", NULL, 0)) exit(2); exit(0); } |