diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-01-18 13:49:53 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-01-18 13:49:53 -0800 |
commit | ec27a940134e940a68228401e54f89d610858a26 (patch) | |
tree | 20201a138630a1d06a78cc54d07c4443656d8af1 /builtin | |
parent | Merge branch 'sb/submodule-fetchjobs-default-to-one' (diff) | |
parent | stripspace: allow -s/-c outside git repository (diff) | |
download | tgif-ec27a940134e940a68228401e54f89d610858a26.tar.xz |
Merge branch 'jn/stripspace-wo-repository'
"git stripspace" should be usable outside a git repository, but
under the "-s" or "-c" mode, it didn't.
* jn/stripspace-wo-repository:
stripspace: allow -s/-c outside git repository
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/stripspace.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/stripspace.c b/builtin/stripspace.c index bdf0328869..be33eb83c1 100644 --- a/builtin/stripspace.c +++ b/builtin/stripspace.c @@ -30,6 +30,7 @@ int cmd_stripspace(int argc, const char **argv, const char *prefix) { struct strbuf buf = STRBUF_INIT; enum stripspace_mode mode = STRIP_DEFAULT; + int nongit; const struct option options[] = { OPT_CMDMODE('s', "strip-comments", &mode, @@ -46,7 +47,7 @@ int cmd_stripspace(int argc, const char **argv, const char *prefix) usage_with_options(stripspace_usage, options); if (mode == STRIP_COMMENTS || mode == COMMENT_LINES) { - setup_git_directory_gently(NULL); + setup_git_directory_gently(&nongit); git_config(git_default_config, NULL); } |