Merge branch 'mg/pretty-magic-space'

* mg/pretty-magic-space:
pretty: Introduce ' ' modifier to add space if non-empty

Conflicts:
pretty.c

diff --combined pretty.c
index 4b85373ba6797069eefa96a63141438bd5de8803,9e845dcb0b7ffca8794b555508b27fe291a0b529..f85444b27d4815547f7cef542291b1f6616f77d5
--- 1/pretty.c
--- 2/pretty.c
+++ b/pretty.c
@@@ -941,7 -941,8 +941,8 @@@ static size_t format_commit_item(struc
        enum {
                NO_MAGIC,
                ADD_LF_BEFORE_NON_EMPTY,
-               DEL_LF_BEFORE_EMPTY
+               DEL_LF_BEFORE_EMPTY,
 -              ADD_SP_BEFORE_NON_EMPTY,
++              ADD_SP_BEFORE_NON_EMPTY
        } magic = NO_MAGIC;
  
        switch (placeholder[0]) {
@@@ -951,6 -952,9 +952,9 @@@
        case '+':
                magic = ADD_LF_BEFORE_NON_EMPTY;
                break;
+       case ' ':
+               magic = ADD_SP_BEFORE_NON_EMPTY;
+               break;
        default:
                break;
        }
@@@ -965,8 -969,11 +969,11 @@@
        if ((orig_len == sb->len) && magic == DEL_LF_BEFORE_EMPTY) {
                while (sb->len && sb->buf[sb->len - 1] == '\n')
                        strbuf_setlen(sb, sb->len - 1);
-       } else if ((orig_len != sb->len) && magic == ADD_LF_BEFORE_NON_EMPTY) {
-               strbuf_insert(sb, orig_len, "\n", 1);
+       } else if (orig_len != sb->len) {
+               if (magic == ADD_LF_BEFORE_NON_EMPTY)
+                       strbuf_insert(sb, orig_len, "\n", 1);
+               else if (magic == ADD_SP_BEFORE_NON_EMPTY)
+                       strbuf_insert(sb, orig_len, " ", 1);
        }
        return consumed + 1;
  }
@@@ -976,7 -983,7 +983,7 @@@ static size_t userformat_want_item(stru
  {
        struct userformat_want *w = context;
  
-       if (*placeholder == '+' || *placeholder == '-')
+       if (*placeholder == '+' || *placeholder == '-' || *placeholder == ' ')
                placeholder++;
  
        switch (*placeholder) {