diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-12-22 19:25:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-22 19:45:06 -0800 |
| commit | 4803466f62777fe3d0b33c8f999ec392f47a5b09 (patch) | |
| tree | 4c2395c4ae84b0ec6c6c780c89c6cb89e5c2db50 /builtin-commit.c | |
| parent | builtin-commit: fix amending of the initial commit (diff) | |
| download | tgif-4803466f62777fe3d0b33c8f999ec392f47a5b09.tar.xz | |
builtin-commit: avoid double-negation in the code.
The flag no_edit meant "we have got final message from the user
and will not editing it any further", but there were quite a few
places that needed to check !no_edit. Rename the variable to
use_editor and reverse the logic everywhere.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-commit.c')
| -rw-r--r-- | builtin-commit.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index eebd4cf066..1d544cbe35 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -48,7 +48,7 @@ static char *edit_message, *use_message; static int all, edit_flag, also, interactive, only, amend, signoff; static int quiet, verbose, untracked_files, no_verify, allow_empty; -static int no_edit, initial_commit, in_merge; +static int use_editor = 1, initial_commit, in_merge; const char *only_include_assumed; struct strbuf message; @@ -372,7 +372,7 @@ static int prepare_log_message(const char *index_file, const char *prefix) strbuf_release(&sb); - if (no_edit) { + if (!use_editor) { struct rev_info rev; unsigned char sha1[20]; const char *parent = "HEAD"; @@ -398,7 +398,7 @@ static int prepare_log_message(const char *index_file, const char *prefix) return !!DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES); } - if (in_merge && !no_edit) + if (in_merge) fprintf(fp, "#\n" "# It looks like you may be committing a MERGE.\n" @@ -513,9 +513,9 @@ static int parse_and_validate_options(int argc, const char *argv[], argc = parse_options(argc, argv, builtin_commit_options, usage, 0); if (logfile || message.len || use_message) - no_edit = 1; + use_editor = 0; if (edit_flag) - no_edit = 0; + use_editor = 1; if (get_sha1("HEAD", head_sha1)) initial_commit = 1; @@ -796,7 +796,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) /* Get the commit message and validate it */ header_len = sb.len; - if (!no_edit) { + if (use_editor) { char index[PATH_MAX]; const char *env[2] = { index, NULL }; snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file); |