diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-11-23 11:23:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-23 11:23:17 -0800 |
| commit | c34a7daad74b0f7b0dc72de131dbb9e919b0ab32 (patch) | |
| tree | 1d2770d0c868cc2be228028e4865724cb860e48d /git.c | |
| parent | Merge branch 'jt/trailer-with-cruft' (diff) | |
| parent | archive: read local configuration (diff) | |
| download | git-c34a7daad74b0f7b0dc72de131dbb9e919b0ab32.tar.gz git-c34a7daad74b0f7b0dc72de131dbb9e919b0ab32.zip | |
Merge branch 'jc/setup-cleanup-fix'
"git archive" and "git mailinfo" stopped reading from local
configuration file with a recent update.
* jc/setup-cleanup-fix:
archive: read local configuration
mailinfo: read local configuration
Diffstat (limited to 'git.c')
| -rw-r--r-- | git.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -396,7 +396,7 @@ static struct cmd_struct commands[] = { { "am", cmd_am, RUN_SETUP | NEED_WORK_TREE }, { "annotate", cmd_annotate, RUN_SETUP }, { "apply", cmd_apply, RUN_SETUP_GENTLY }, - { "archive", cmd_archive }, + { "archive", cmd_archive, RUN_SETUP_GENTLY }, { "bisect--helper", cmd_bisect__helper, RUN_SETUP }, { "blame", cmd_blame, RUN_SETUP }, { "branch", cmd_branch, RUN_SETUP }, @@ -445,7 +445,7 @@ static struct cmd_struct commands[] = { { "ls-files", cmd_ls_files, RUN_SETUP | SUPPORT_SUPER_PREFIX }, { "ls-remote", cmd_ls_remote, RUN_SETUP_GENTLY }, { "ls-tree", cmd_ls_tree, RUN_SETUP }, - { "mailinfo", cmd_mailinfo }, + { "mailinfo", cmd_mailinfo, RUN_SETUP_GENTLY }, { "mailsplit", cmd_mailsplit }, { "merge", cmd_merge, RUN_SETUP | NEED_WORK_TREE }, { "merge-base", cmd_merge_base, RUN_SETUP }, |