92068ae8bf
The way "git stripspace" reads the configuration was not quite
kosher, in that the code forgot to probe for a possibly existing
repository (note: stripspace is designed to be usable outside the
repository as well). It read .git/config only when it was run from
the top-level of the working tree by accident. A recent change
b9605bc4f2 ("config: only read .git/config from configured repos",
2016-09-12) stopped reading the repository-local configuration file
".git/config" unless the repository discovery process is done, so
that .git/config is never read even when run from the top-level,
exposing the old bug more.
When rebasing interactively with a commentChar defined in the
current repository's config, the help text at the bottom of the edit
script potentially used an incorrect comment character. This was not
only funny-looking, but also resulted in tons of warnings like this
one:
Warning: the command isn't recognized in the following line
- #
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
64 lines
1.5 KiB
C
64 lines
1.5 KiB
C
#include "builtin.h"
|
|
#include "cache.h"
|
|
#include "parse-options.h"
|
|
#include "strbuf.h"
|
|
|
|
static void comment_lines(struct strbuf *buf)
|
|
{
|
|
char *msg;
|
|
size_t len;
|
|
|
|
msg = strbuf_detach(buf, &len);
|
|
strbuf_add_commented_lines(buf, msg, len);
|
|
free(msg);
|
|
}
|
|
|
|
static const char * const stripspace_usage[] = {
|
|
N_("git stripspace [-s | --strip-comments]"),
|
|
N_("git stripspace [-c | --comment-lines]"),
|
|
NULL
|
|
};
|
|
|
|
enum stripspace_mode {
|
|
STRIP_DEFAULT = 0,
|
|
STRIP_COMMENTS,
|
|
COMMENT_LINES
|
|
};
|
|
|
|
int cmd_stripspace(int argc, const char **argv, const char *prefix)
|
|
{
|
|
struct strbuf buf = STRBUF_INIT;
|
|
enum stripspace_mode mode = STRIP_DEFAULT;
|
|
|
|
const struct option options[] = {
|
|
OPT_CMDMODE('s', "strip-comments", &mode,
|
|
N_("skip and remove all lines starting with comment character"),
|
|
STRIP_COMMENTS),
|
|
OPT_CMDMODE('c', "comment-lines", &mode,
|
|
N_("prepend comment character and space to each line"),
|
|
COMMENT_LINES),
|
|
OPT_END()
|
|
};
|
|
|
|
argc = parse_options(argc, argv, prefix, options, stripspace_usage, 0);
|
|
if (argc)
|
|
usage_with_options(stripspace_usage, options);
|
|
|
|
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");
|
|
|
|
if (mode == STRIP_DEFAULT || mode == STRIP_COMMENTS)
|
|
strbuf_stripspace(&buf, mode == STRIP_COMMENTS);
|
|
else
|
|
comment_lines(&buf);
|
|
|
|
write_or_die(1, buf.buf, buf.len);
|
|
strbuf_release(&buf);
|
|
return 0;
|
|
}
|