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 | bd53f38d52b87340ad791290d700c5c7e8587f23 (patch) | |
| tree | ecff6137224ddcd8d0e20a9a7c68fec94f056841 /builtin | |
| parent | Merge branch 'jc/for-each-ref-head-segfault-fix' (diff) | |
| parent | rebase -i: handle core.commentChar=auto (diff) | |
| download | tgif-bd53f38d52b87340ad791290d700c5c7e8587f23.tar.xz | |
Merge branch 'js/rebase-i-commentchar-fix'
"git rebase -i" did not work well with core.commentchar
configuration variable for two reasons, both of which have been
fixed.
* js/rebase-i-commentchar-fix:
rebase -i: handle core.commentChar=auto
stripspace: respect repository config
rebase -i: highlight problems with core.commentchar
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/stripspace.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/stripspace.c b/builtin/stripspace.c index 15e716ef43..1e62a008cb 100644 --- a/builtin/stripspace.c +++ b/builtin/stripspace.c @@ -44,8 +44,10 @@ int cmd_stripspace(int argc, const char **argv, const char *prefix) if (argc) usage_with_options(stripspace_usage, options); - if (mode == STRIP_COMMENTS || mode == COMMENT_LINES) + if (mode == STRIP_COMMENTS || mode == COMMENT_LINES) { + setup_git_directory_gently(NULL); git_config(git_default_config, NULL); + } if (strbuf_read(&buf, 0, 1024) < 0) die_errno("could not read the input"); |