[PATCH 1/2] format-patch: rename "no_inline" field

[Junio C Hamano]

The name of the fields invites a misunderstanding that setting it to
false, saying "No, I will not to tell you not to inline", make the
patch inlined in the body of the message, but that is not what it
does.  The result is still a MIME attachment as long as
mime_boundary is set.  This field only controls if the content
disposition of a MIME attachment is set to "attachment" or "inline".

Rename it to clarify what it is used for.  Besides, a toggle whose
name is "no_frotz" is asking for a double-negation.  Calling it
"disposition-attachment" allows us to naturally read setting the
field to true as "Yes, I want to set content-disposition to
'attachment'".

Signed-off-by: Junio C Hamano <gits...@pobox.com>
---

 * This is a general "clean-up" patch that does not add any feature
   nor fixes any bug.

 builtin/log.c | 6 +++---
 log-tree.c    | 2 +-
 revision.h    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/builtin/log.c b/builtin/log.c
index 8f0b2e8..30265d8 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -983,7 +983,7 @@ static int attach_callback(const struct option *opt, const 
char *arg, int unset)
                rev->mime_boundary = arg;
        else
                rev->mime_boundary = git_version_string;
-       rev->no_inline = unset ? 0 : 1;
+       rev->disposition_attachment = unset ? 0 : 1;
        return 0;
 }
 
@@ -996,7 +996,7 @@ static int inline_callback(const struct option *opt, const 
char *arg, int unset)
                rev->mime_boundary = arg;
        else
                rev->mime_boundary = git_version_string;
-       rev->no_inline = 0;
+       rev->disposition_attachment = 0;
        return 0;
 }
 
@@ -1172,7 +1172,7 @@ int cmd_format_patch(int argc, const char **argv, const 
char *prefix)
 
        if (default_attach) {
                rev.mime_boundary = default_attach;
-               rev.no_inline = 1;
+               rev.disposition_attachment = 1;
        }
 
        /*
diff --git a/log-tree.c b/log-tree.c
index 5dc45c4..34ec20d 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -408,7 +408,7 @@ void log_write_email_headers(struct rev_info *opt, struct 
commit *commit,
                         " filename=\"%s\"\n\n",
                         mime_boundary_leader, opt->mime_boundary,
                         filename.buf,
-                        opt->no_inline ? "attachment" : "inline",
+                        opt->disposition_attachment ? "attachment" : "inline",
                         filename.buf);
                opt->diffopt.stat_sep = buffer;
                strbuf_release(&filename);
diff --git a/revision.h b/revision.h
index 5da09ee..90813dd 100644
--- a/revision.h
+++ b/revision.h
@@ -142,7 +142,7 @@ struct rev_info {
        const char      *extra_headers;
        const char      *log_reencode;
        const char      *subject_prefix;
-       int             no_inline;
+       int             disposition_attachment;
        int             show_log_size;
        struct string_list *mailmap;
 
-- 
1.8.2.rc0.129.gcce6fe7

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html