admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'nd/the-index' into md/list-objects-filter-by-depth

Browse Source
This commit is contained in:
Junio C Hamano
2018-12-28 10:41:41 -08:00
parent b9fbc04e26 36e7ed69de
commit 0aa9d8aa6c
66 changed files with 652 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/commit.c
View File

@@ -188,7 +188,7 @@ static void determine_whence(struct wt_status *s)
static void status_init_config(struct wt_status *s, config_fn_t fn)
{
wt_status_prepare(s);
wt_status_prepare(the_repository, s);
init_diff_ui_defaults();
git_config(fn, s);
determine_whence(s);
@@ -911,7 +911,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);
@@ -1682,7 +1683,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
flags |= SUMMARY_INITIAL_COMMIT;
if (author_date_is_interesting())
flags |= SUMMARY_SHOW_AUTHOR_DATE;
print_commit_summary(prefix, &oid, flags);
print_commit_summary(the_repository, prefix,
&oid, flags);
}
UNLEAK(err);