From: Teng Long <dyroneteng@gmail.com>
To: dyroneteng@gmail.com
Cc: avarab@gmail.com, git@vger.kernel.org, gitster@pobox.com,
sunshine@sunshineco.com, tenglong.tl@alibaba-inc.com
Subject: [PATCH v9 0/6] notes.c: introduce "--separator" option
Date: Fri, 28 Apr 2023 17:23:28 +0800 [thread overview]
Message-ID: <cover.1682671758.git.dyroneteng@gmail.com> (raw)
In-Reply-To: <cover.1682429602.git.dyroneteng@gmail.com>
From: Teng Long <dyroneteng@gmail.com>
Diff since v8:
1. test case: Uniform indent format, as recommended by Junio C Hamano.
2. [4/6] make the static var "separator" initialized as "\n", simplify
the code in "insert_separator(...)".
3. [4/6] I don't change the other parts about the "struct note_msg", the
stripspace way (Junio suggest to consider about the stripspace each messge
individually, but I found it will break the compatibility about "-C",
which can be found the case of 'reuse with "-C" and add note with "-m",
"-m" will stripspace all together').
4. [5/6] Optimized the commit message and replace "strbuf_insert*(...)" with
"strbuf_add*(...)".
5. [6/6] As Junio replied, I'm not sure whether the "-C" problem (When the
"-C" argument is used with "-m/-F", the order of "-C" in the options will
affect the result of stripspace differently,) is need to be fixed or keep
as is, I choose to do not break the old behaviour (In fact, I hope to fix
this issue in another patch, if at all, and let this long-tailed patchset
to mature faster, maybe).
Thanks.
Teng Long (6):
notes.c: cleanup 'strbuf_grow' call in 'append_edit'
notes.c: use designated initializers for clarity
t3321: add test cases about the notes stripspace behavior
notes.c: introduce '--separator=<paragraph-break>' option
notes.c: append separator instead of insert by pos
notes.c: introduce "--[no-]stripspace" option
Documentation/git-notes.txt | 42 ++-
builtin/notes.c | 141 ++++++---
t/t3301-notes.sh | 126 ++++++++
t/t3321-notes-stripspace.sh | 577 ++++++++++++++++++++++++++++++++++++
4 files changed, 844 insertions(+), 42 deletions(-)
create mode 100755 t/t3321-notes-stripspace.sh
Range-diff against v8:
1: 0634434e = 1: 0634434e notes.c: cleanup 'strbuf_grow' call in 'append_edit'
2: 4ad78405 = 2: 4ad78405 notes.c: use designated initializers for clarity
3: 6dfb5bf2 ! 3: c2fc2091 t3321: add test cases about the notes stripspace behavior
@@ t/t3321-notes-stripspace.sh (new)
@@
+#!/bin/sh
+#
-+# Copyright (c) 2007 Teng Long
++# Copyright (c) 2023 Teng Long
+#
+
+test_description='Test commit notes with stripspace behavior'
@@ t/t3321-notes-stripspace.sh (new)
+test_expect_success 'add note by editor' '
+ test_when_finished "git notes remove" &&
+ cat >expect <<-EOF &&
-+ first-line
++ first-line
+
-+ second-line
++ second-line
+ EOF
+
+ MSG="${LF}first-line${MULTI_LF}second-line${LF}" git notes add &&
@@ t/t3321-notes-stripspace.sh (new)
+test_expect_success 'add note by specifying single "-m"' '
+ test_when_finished "git notes remove" &&
+ cat >expect <<-EOF &&
-+ first-line
++ first-line
+
-+ second-line
++ second-line
+ EOF
+
+ git notes add -m "${LF}first-line${MULTI_LF}second-line${LF}" &&
@@ t/t3321-notes-stripspace.sh (new)
+test_expect_success 'append note by editor' '
+ test_when_finished "git notes remove" &&
+ cat >expect <<-EOF &&
-+ first-line
++ first-line
+
-+ second-line
++ second-line
+ EOF
+
+ git notes add -m "first-line" &&
@@ t/t3321-notes-stripspace.sh (new)
+test_expect_success 'append note by specifying single "-m"' '
+ test_when_finished "git notes remove" &&
+ cat >expect <<-EOF &&
-+ first-line
++ first-line
+
-+ second-line
++ second-line
+ EOF
+
+ git notes add -m "${LF}first-line" &&
@@ t/t3321-notes-stripspace.sh (new)
+test_expect_success 'add note by specifying single "-F"' '
+ test_when_finished "git notes remove" &&
+ cat >expect <<-EOF &&
-+ first-line
++ first-line
+
-+ second-line
++ second-line
+ EOF
+
+ cat >note-file <<-EOF &&
-+ ${LF}
-+ first-line
-+ ${MULTI_LF}
-+ second-line
-+ ${LF}
++ ${LF}
++ first-line
++ ${MULTI_LF}
++ second-line
++ ${LF}
+ EOF
+
+ git notes add -F note-file &&
@@ t/t3321-notes-stripspace.sh (new)
+test_expect_success 'add notes by specifying multiple "-F"' '
+ test_when_finished "git notes remove" &&
+ cat >expect <<-EOF &&
-+ file-1-first-line
++ file-1-first-line
+
-+ file-1-second-line
++ file-1-second-line
+
-+ file-2-first-line
++ file-2-first-line
+
-+ file-2-second-line
++ file-2-second-line
+ EOF
+
+ cat >note-file-1 <<-EOF &&
-+ ${LF}
-+ file-1-first-line
-+ ${MULTI_LF}
-+ file-1-second-line
-+ ${LF}
++ ${LF}
++ file-1-first-line
++ ${MULTI_LF}
++ file-1-second-line
++ ${LF}
+ EOF
+
+ cat >note-file-2 <<-EOF &&
-+ ${LF}
-+ file-2-first-line
-+ ${MULTI_LF}
-+ file-2-second-line
-+ ${LF}
++ ${LF}
++ file-2-first-line
++ ${MULTI_LF}
++ file-2-second-line
++ ${LF}
+ EOF
+
+ git notes add -F note-file-1 -F note-file-2 &&
@@ t/t3321-notes-stripspace.sh (new)
+test_expect_success 'append note by specifying single "-F"' '
+ test_when_finished "git notes remove" &&
+ cat >expect <<-EOF &&
-+ initial-line
++ initial-line
+
-+ first-line
++ first-line
+
-+ second-line
++ second-line
+ EOF
+
+ cat >note-file <<-EOF &&
-+ ${LF}
-+ first-line
-+ ${MULTI_LF}
-+ second-line
-+ ${LF}
++ ${LF}
++ first-line
++ ${MULTI_LF}
++ second-line
++ ${LF}
+ EOF
+
+ git notes add -m "initial-line" &&
@@ t/t3321-notes-stripspace.sh (new)
+test_expect_success 'append notes by specifying multiple "-F"' '
+ test_when_finished "git notes remove" &&
+ cat >expect <<-EOF &&
-+ initial-line
++ initial-line
+
-+ file-1-first-line
++ file-1-first-line
+
-+ file-1-second-line
++ file-1-second-line
+
-+ file-2-first-line
++ file-2-first-line
+
-+ file-2-second-line
++ file-2-second-line
+ EOF
+
+ cat >note-file-1 <<-EOF &&
-+ ${LF}
-+ file-1-first-line
-+ ${MULTI_LF}
-+ file-1-second-line
-+ ${LF}
++ ${LF}
++ file-1-first-line
++ ${MULTI_LF}
++ file-1-second-line
++ ${LF}
+ EOF
+
+ cat >note-file-2 <<-EOF &&
-+ ${LF}
-+ file-2-first-line
-+ ${MULTI_LF}
-+ file-2-second-line
-+ ${LF}
++ ${LF}
++ file-2-first-line
++ ${MULTI_LF}
++ file-2-second-line
++ ${LF}
+ EOF
+
+ git notes add -m "initial-line" &&
@@ t/t3321-notes-stripspace.sh (new)
+test_expect_success 'add note by specifying "-C" , do not stripspace is the default behavior' '
+ test_when_finished "git notes remove" &&
+ cat >expect <<-EOF &&
-+ ${LF}
-+ first-line
-+ ${MULTI_LF}
-+ second-line
-+ ${LF}
++ ${LF}
++ first-line
++ ${MULTI_LF}
++ second-line
++ ${LF}
+ EOF
+
+ cat expect | git hash-object -w --stdin >blob &&
@@ t/t3321-notes-stripspace.sh (new)
+test_expect_success 'add notes with "-C" and "-m", "-m" will stripspace all together' '
+ test_when_finished "git notes remove" &&
+ cat >data <<-EOF &&
-+ ${LF}
-+ first-line
-+ ${MULTI_LF}
-+ second-line
-+ ${LF}
++ ${LF}
++ first-line
++ ${MULTI_LF}
++ second-line
++ ${LF}
+ EOF
+
+ cat >expect <<-EOF &&
-+ first-line
++ first-line
+
-+ second-line
++ second-line
+
-+ third-line
++ third-line
+ EOF
+
+ cat data | git hash-object -w --stdin >blob &&
@@ t/t3321-notes-stripspace.sh (new)
+ test_when_finished "git notes remove" &&
+ cat >data <<-EOF &&
+
-+ second-line
++ second-line
+ EOF
+
+ cat >expect <<-EOF &&
-+ first-line
-+ ${LF}
-+ second-line
++ first-line
++ ${LF}
++ second-line
+ EOF
+
+ cat data | git hash-object -w --stdin >blob &&
4: be86f9ca ! 4: ed930ef4 notes.c: introduce '--separator=<paragraph-break>' option
@@ Commit message
insert a blank line between the paragraphs, like:
$ git notes add -m foo -m bar
- $ git notes show HEAD | cat
+ $ git notes show HEAD
foo
bar
@@ Commit message
'git notes append', for example when executing:
$ git notes add -m foo -m bar --separator="-"
- $ git notes show HEAD | cat
+ $ git notes show HEAD
foo
-
bar
@@ builtin/notes.c
#include "worktree.h"
#include "write-or-die.h"
-+static char *separator = NULL;
++static char *separator = "\n";
static const char * const git_notes_usage[] = {
N_("git notes [--ref <notes-ref>] [list [<object>]]"),
- N_("git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]"),
@@ builtin/notes.c: static void free_note_data(struct note_data *d)
}
strbuf_release(&d->buf);
+
-+ while (d->msg_nr) {
-+ --d->msg_nr;
++ while (d->msg_nr--) {
+ strbuf_release(&d->messages[d->msg_nr]->buf);
+ free(d->messages[d->msg_nr]);
+ }
@@ builtin/notes.c: static void write_note_data(struct note_data *d, struct object_
+static void insert_separator(struct strbuf *message, size_t pos)
+{
-+ if (!separator)
-+ strbuf_insertstr(message, pos, "\n");
-+ else if (separator[strlen(separator) - 1] == '\n')
-+ strbuf_insertstr(message, pos, separator);
++ if (separator[strlen(separator) - 1] == '\n')
++ strbuf_addstr(message, separator);
+ else
+ strbuf_insertf(message, pos, "%s%s", separator, "\n");
+}
5: ef40e0ef ! 5: eea2246f notes.c: append separator instead of insert by pos
@@ Metadata
## Commit message ##
notes.c: append separator instead of insert by pos
- This commit rename "insert_separator" to "append_separator" and also
- remove the "postion" argument, this serves two purpose:
+ Rename "insert_separator" to "append_separator" and also remove the
+ "postion" argument, this serves two purpose:
The first is that when specifying more than one "-m" ( like "-F", etc)
to "git notes add" or "git notes append", the order of them matters,
@@ Commit message
so we don't have to make the caller specify the position, the "append"
operation is enough and clear.
- The second is that when we execute the "git notes append" subcommand
- , we need to combine the "prev_note" and "current_note" to get the
+ The second is that when we execute the "git notes append" subcommand,
+ we need to combine the "prev_note" and "current_note" to get the
final result. Before, we inserted a newline character at the beginning
of "current_note". Now, we will append a newline to the end of
"prev_note" instead, this will give the consisitent results.
@@ builtin/notes.c: static void write_note_data(struct note_data *d, struct object_
-static void insert_separator(struct strbuf *message, size_t pos)
+static void append_separator(struct strbuf *message)
{
- if (!separator)
-- strbuf_insertstr(message, pos, "\n");
-+ strbuf_insertstr(message, message->len, "\n");
- else if (separator[strlen(separator) - 1] == '\n')
-- strbuf_insertstr(message, pos, separator);
-+ strbuf_insertstr(message, message->len, separator);
+ if (separator[strlen(separator) - 1] == '\n')
+ strbuf_addstr(message, separator);
else
- strbuf_insertf(message, pos, "%s%s", separator, "\n");
-+ strbuf_insertf(message, message->len, "%s%s", separator, "\n");
++ strbuf_addf(message, "%s%s", separator, "\n");
}
static void concat_messages(struct note_data *d)
6: f60f7432 ! 6: 20063bea notes.c: introduce "--[no-]stripspace" option
@@ t/t3321-notes-stripspace.sh: test_expect_success 'add note by editor' '
+test_expect_success 'add note by specifying single "-m", "--stripspace" is the default behavior' '
test_when_finished "git notes remove" &&
cat >expect <<-EOF &&
- first-line
+ first-line
@@ t/t3321-notes-stripspace.sh: test_expect_success 'add note by specifying single "-m"' '
git notes add -m "${LF}first-line${MULTI_LF}second-line${LF}" &&
@@ t/t3321-notes-stripspace.sh: test_expect_success 'add note by specifying single
+test_expect_success 'add note by specifying single "-m" and "--no-stripspace" ' '
+ test_when_finished "git notes remove" &&
+ cat >expect <<-EOF &&
-+ ${LF}first-line${MULTI_LF}second-line
++ ${LF}first-line${MULTI_LF}second-line
+ EOF
+
+ git notes add --no-stripspace \
@@ t/t3321-notes-stripspace.sh: test_expect_success 'add note by specifying multipl
test_cmp expect actual
'
--
--test_expect_success 'append note by editor' '
+test_expect_success 'add notes by specifying multiple "-m" and "--no-stripspace"' '
- test_when_finished "git notes remove" &&
- cat >expect <<-EOF &&
-+ ${LF}
- first-line
--
-- second-line
-+ ${MULTI_LF}
-+ second-line${LF}
- EOF
-
-- git notes add -m "first-line" &&
-- MSG="${MULTI_LF}second-line${LF}" git notes append &&
++ test_when_finished "git notes remove" &&
++ cat >expect <<-EOF &&
++ ${LF}
++ first-line
++ ${MULTI_LF}
++ second-line${LF}
++ EOF
++
+ git notes add --no-stripspace \
+ -m "${LF}" \
+ -m "first-line" \
+ -m "${MULTI_LF}" \
+ -m "second-line" \
+ -m "${LF}" &&
- git notes show >actual &&
- test_cmp expect actual
- '
-
--test_expect_success 'append note by specifying single "-m"' '
-+test_expect_success 'add note by specifying single "-F", "--stripspace" is the default behavior' '
- test_when_finished "git notes remove" &&
- cat >expect <<-EOF &&
- first-line
-@@ t/t3321-notes-stripspace.sh: test_expect_success 'append note by specifying single "-m"' '
- second-line
- EOF
-
-- git notes add -m "${LF}first-line" &&
-- git notes append -m "${MULTI_LF}second-line${LF}" &&
-- git notes show >actual &&
-- test_cmp expect actual
--'
--
--test_expect_success 'append note by specifying multiple "-m"' '
-- test_when_finished "git notes remove" &&
-- cat >expect <<-EOF &&
-- first-line
--
-- second-line
-+ cat >note-file <<-EOF &&
-+ ${LF}
-+ first-line
-+ ${MULTI_LF}
-+ second-line
-+ ${LF}
- EOF
-
-- git notes add -m "${LF}first-line" &&
-- git notes append -m "${MULTI_LF}" \
-- -m "second-line" \
-- -m "${LF}" &&
-+ git notes add -F note-file &&
- git notes show >actual &&
-- test_cmp expect actual
-+ test_cmp expect actual &&
-+ git notes remove &&
-+ git notes add --stripspace -F note-file &&
-+ git notes show >actual
- '
-
--test_expect_success 'add note by specifying single "-F"' '
-+test_expect_success 'add note by specifying single "-F" and "--no-stripspace"' '
- test_when_finished "git notes remove" &&
- cat >expect <<-EOF &&
-+ ${LF}
- first-line
--
-+ ${MULTI_LF}
- second-line
-+ ${LF}
- EOF
-
- cat >note-file <<-EOF &&
-@@ t/t3321-notes-stripspace.sh: test_expect_success 'add note by specifying single "-F"' '
- ${LF}
- EOF
-
-- git notes add -F note-file &&
-+ git notes add --no-stripspace -F note-file &&
- git notes show >actual &&
- test_cmp expect actual
- '
-
--test_expect_success 'add notes by specifying multiple "-F"' '
-+test_expect_success 'add note by specifying multiple "-F", "--stripspace" is the default behavior' '
- test_when_finished "git notes remove" &&
- cat >expect <<-EOF &&
- file-1-first-line
-@@ t/t3321-notes-stripspace.sh: test_expect_success 'add notes by specifying multiple "-F"' '
-
- git notes add -F note-file-1 -F note-file-2 &&
- git notes show >actual &&
-+ test_cmp expect actual &&
-+ git notes remove &&
-+ git notes add --stripspace -F note-file-1 -F note-file-2 &&
+ git notes show >actual &&
+ test_cmp expect actual
+'
+
-+test_expect_success 'add note by specifying multiple "-F" with "--no-stripspace"' '
++test_expect_success 'add note by specifying single "-F", "--stripspace" is the default behavior' '
+ test_when_finished "git notes remove" &&
+ cat >expect <<-EOF &&
-+ ${LF}
-+ file-1-first-line
-+ ${MULTI_LF}
-+ file-1-second-line
-+ ${LF}
-+
-+ ${LF}
-+ file-2-first-line
-+ ${MULTI_LF}
-+ file-2-second-line
-+ ${LF}
-+ EOF
++ first-line
+
-+ cat >note-file-1 <<-EOF &&
-+ ${LF}
-+ file-1-first-line
-+ ${MULTI_LF}
-+ file-1-second-line
-+ ${LF}
++ second-line
+ EOF
+
-+ cat >note-file-2 <<-EOF &&
-+ ${LF}
-+ file-2-first-line
-+ ${MULTI_LF}
-+ file-2-second-line
-+ ${LF}
++ cat >note-file <<-EOF &&
++ ${LF}
++ first-line
++ ${MULTI_LF}
++ second-line
++ ${LF}
+ EOF
+
-+ git notes add --no-stripspace -F note-file-1 -F note-file-2 &&
++ git notes add -F note-file &&
+ git notes show >actual &&
-+ test_cmp expect actual
++ test_cmp expect actual &&
++ git notes remove &&
++ git notes add --stripspace -F note-file &&
++ git notes show >actual
+'
+
-+test_expect_success 'append note by editor' '
++test_expect_success 'add note by specifying single "-F" and "--no-stripspace"' '
+ test_when_finished "git notes remove" &&
+ cat >expect <<-EOF &&
-+ first-line
++ ${LF}
++ first-line
++ ${MULTI_LF}
++ second-line
++ ${LF}
++ EOF
+
-+ second-line
++ cat >note-file <<-EOF &&
++ ${LF}
++ first-line
++ ${MULTI_LF}
++ second-line
++ ${LF}
+ EOF
+
-+ git notes add -m "first-line" &&
-+ MSG="${MULTI_LF}second-line${LF}" git notes append &&
++ git notes add --no-stripspace -F note-file &&
+ git notes show >actual &&
+ test_cmp expect actual
+'
+
-+test_expect_success 'append note by specifying single "-m"' '
++test_expect_success 'add note by specifying multiple "-F", "--stripspace" is the default behavior' '
+ test_when_finished "git notes remove" &&
+ cat >expect <<-EOF &&
-+ first-line
++ file-1-first-line
++
++ file-1-second-line
++
++ file-2-first-line
+
-+ second-line
++ file-2-second-line
++ EOF
++
++ cat >note-file-1 <<-EOF &&
++ ${LF}
++ file-1-first-line
++ ${MULTI_LF}
++ file-1-second-line
++ ${LF}
++ EOF
++
++ cat >note-file-2 <<-EOF &&
++ ${LF}
++ file-2-first-line
++ ${MULTI_LF}
++ file-2-second-line
++ ${LF}
+ EOF
+
-+ git notes add -m "${LF}first-line" &&
-+ git notes append -m "${MULTI_LF}second-line${LF}" &&
++ git notes add -F note-file-1 -F note-file-2 &&
++ git notes show >actual &&
++ test_cmp expect actual &&
++ git notes remove &&
++ git notes add --stripspace -F note-file-1 -F note-file-2 &&
+ git notes show >actual &&
+ test_cmp expect actual
+'
+
-+test_expect_success 'append note by specifying multiple "-m"' '
++test_expect_success 'add note by specifying multiple "-F" with "--no-stripspace"' '
+ test_when_finished "git notes remove" &&
+ cat >expect <<-EOF &&
-+ first-line
++ ${LF}
++ file-1-first-line
++ ${MULTI_LF}
++ file-1-second-line
++ ${LF}
++
++ ${LF}
++ file-2-first-line
++ ${MULTI_LF}
++ file-2-second-line
++ ${LF}
++ EOF
+
-+ second-line
++ cat >note-file-1 <<-EOF &&
++ ${LF}
++ file-1-first-line
++ ${MULTI_LF}
++ file-1-second-line
++ ${LF}
++ EOF
++
++ cat >note-file-2 <<-EOF &&
++ ${LF}
++ file-2-first-line
++ ${MULTI_LF}
++ file-2-second-line
++ ${LF}
+ EOF
+
-+ git notes add -m "${LF}first-line" &&
-+ git notes append -m "${MULTI_LF}" -m "second-line" -m "${LF}" &&
++ git notes add --no-stripspace -F note-file-1 -F note-file-2 &&
+ git notes show >actual &&
- test_cmp expect actual
- '
++ test_cmp expect actual
++'
+ test_expect_success 'append note by editor' '
+ test_when_finished "git notes remove" &&
@@ t/t3321-notes-stripspace.sh: test_expect_success 'append notes by specifying multiple "-F"' '
test_cmp expect actual
'
@@ t/t3321-notes-stripspace.sh: test_expect_success 'append notes by specifying mul
+test_expect_success 'append note by specifying multiple "-F" with "--no-stripspace"' '
+ test_when_finished "git notes remove" &&
+ cat >expect <<-EOF &&
-+ initial-line
-+ ${LF}${LF}
-+ file-1-first-line
-+ ${MULTI_LF}
-+ file-1-second-line
-+ ${LF}
-+
-+ ${LF}
-+ file-2-first-line
-+ ${MULTI_LF}
-+ file-2-second-line
-+ ${LF}
++ initial-line
++ ${LF}${LF}
++ file-1-first-line
++ ${MULTI_LF}
++ file-1-second-line
++ ${LF}
++
++ ${LF}
++ file-2-first-line
++ ${MULTI_LF}
++ file-2-second-line
++ ${LF}
+ EOF
+
+ cat >note-file-1 <<-EOF &&
-+ ${LF}
-+ file-1-first-line
-+ ${MULTI_LF}
-+ file-1-second-line
-+ ${LF}
++ ${LF}
++ file-1-first-line
++ ${MULTI_LF}
++ file-1-second-line
++ ${LF}
+ EOF
+
+ cat >note-file-2 <<-EOF &&
-+ ${LF}
-+ file-2-first-line
-+ ${MULTI_LF}
-+ file-2-second-line
-+ ${LF}
++ ${LF}
++ file-2-first-line
++ ${MULTI_LF}
++ file-2-second-line
++ ${LF}
+ EOF
+
+ git notes add -m "initial-line" &&
@@ t/t3321-notes-stripspace.sh: test_expect_success 'add notes with empty messages'
+test_expect_success 'add note by specifying "-C", "--no-stripspace" is the default behavior' '
test_when_finished "git notes remove" &&
cat >expect <<-EOF &&
- ${LF}
+ ${LF}
@@ t/t3321-notes-stripspace.sh: test_expect_success 'add note by specifying "-C" , do not stripspace is the defa
cat expect | git hash-object -w --stdin >blob &&
git notes add -C $(cat blob) &&
@@ t/t3321-notes-stripspace.sh: test_expect_success 'add note by specifying "-C" ,
+test_expect_success 'reuse note by specifying "-C" and "--stripspace"' '
+ test_when_finished "git notes remove" &&
+ cat >data <<-EOF &&
-+ ${LF}
-+ first-line
-+ ${MULTI_LF}
-+ second-line
-+ ${LF}
++ ${LF}
++ first-line
++ ${MULTI_LF}
++ second-line
++ ${LF}
+ EOF
+
+ cat >expect <<-EOF &&
-+ first-line
++ first-line
+
-+ second-line
++ second-line
+ EOF
+
+ cat data | git hash-object -w --stdin >blob &&
@@ t/t3321-notes-stripspace.sh: test_expect_success 'add note by specifying "-C" ,
+test_expect_success 'reuse with "-C" and add note with "-m", "-m" will stripspace all together' '
test_when_finished "git notes remove" &&
cat >data <<-EOF &&
- ${LF}
+ ${LF}
@@ t/t3321-notes-stripspace.sh: test_expect_success 'add notes with "-C" and "-m", "-m" will stripspace all toge
test_cmp expect actual
'
@@ t/t3321-notes-stripspace.sh: test_expect_success 'add notes with "-m" and "-C",
+test_expect_success 'add note by specifying "-c", "--stripspace" is the default behavior' '
+ test_when_finished "git notes remove" &&
+ cat >expect <<-EOF &&
-+ first-line
++ first-line
+
-+ second-line
++ second-line
+ EOF
+
+ echo "initial-line" | git hash-object -w --stdin >blob &&
@@ t/t3321-notes-stripspace.sh: test_expect_success 'add notes with "-m" and "-C",
+test_expect_success 'add note by specifying "-c" with "--no-stripspace"' '
+ test_when_finished "git notes remove" &&
+ cat >expect <<-EOF &&
-+ ${LF}first-line${MULTI_LF}second-line${LF}
++ ${LF}first-line${MULTI_LF}second-line${LF}
+ EOF
+
+ echo "initial-line" | git hash-object -w --stdin >blob &&
@@ t/t3321-notes-stripspace.sh: test_expect_success 'add notes with "-m" and "-C",
+test_expect_success 'edit note by specifying "-c", "--stripspace" is the default behavior' '
+ test_when_finished "git notes remove" &&
+ cat >expect <<-EOF &&
-+ first-line
++ first-line
+
-+ second-line
++ second-line
+ EOF
+
+ MSG="${LF}first-line${MULTI_LF}second-line${LF}" git notes edit &&
@@ t/t3321-notes-stripspace.sh: test_expect_success 'add notes with "-m" and "-C",
+test_expect_success 'edit note by specifying "-c" with "--no-stripspace"' '
+ test_when_finished "git notes remove" &&
+ cat >expect <<-EOF &&
-+ ${LF}first-line${MULTI_LF}second-line${LF}
++ ${LF}first-line${MULTI_LF}second-line${LF}
+ EOF
+
+ MSG="${LF}first-line${MULTI_LF}second-line${LF}" git notes add --no-stripspace &&
--
2.40.0.358.g2947072e.dirty
next prev parent reply other threads:[~2023-04-28 9:23 UTC|newest]
Thread overview: 186+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-13 5:56 [RFC PATCH 0/2] notes.c: introduce "--no-blankline" option Teng Long
2022-10-13 5:56 ` [RFC PATCH 1/2] " Teng Long
2022-10-13 6:06 ` Junio C Hamano
2022-10-17 13:19 ` Teng Long
2022-10-13 9:31 ` Ævar Arnfjörð Bjarmason
2022-10-17 13:33 ` Teng Long
2022-10-13 5:56 ` [RFC PATCH 2/2] notes.c: fixed tip when target and append note are both empty Teng Long
2022-10-13 9:36 ` Ævar Arnfjörð Bjarmason
2022-10-13 10:10 ` Phillip Wood
2022-10-13 10:23 ` Ævar Arnfjörð Bjarmason
2022-10-15 19:40 ` Phillip Wood
2022-10-18 3:25 ` Teng Long
2022-10-18 8:08 ` Teng Long
2022-10-18 3:11 ` Teng Long
2022-10-18 9:23 ` Ævar Arnfjörð Bjarmason
2022-11-07 13:57 ` [PATCH v2 0/3] notes.c: introduce "--blank-line" option Teng Long
2022-11-07 13:57 ` [PATCH v2 1/3] " Teng Long
2022-11-07 14:45 ` Ævar Arnfjörð Bjarmason
2022-11-07 15:45 ` Eric Sunshine
2022-11-07 17:22 ` Ævar Arnfjörð Bjarmason
2022-11-07 21:46 ` Taylor Blau
2022-11-07 22:36 ` Ævar Arnfjörð Bjarmason
2022-11-08 0:32 ` Taylor Blau
2022-11-08 3:45 ` Teng Long
2022-11-08 13:06 ` Teng Long
2022-11-08 13:22 ` Ævar Arnfjörð Bjarmason
2022-11-09 6:35 ` Teng Long
2022-11-07 15:06 ` Ævar Arnfjörð Bjarmason
2022-11-08 6:32 ` Teng Long
2022-11-07 21:47 ` Taylor Blau
2022-11-08 7:36 ` Teng Long
2022-11-07 13:57 ` [PATCH v2 2/3] notes.c: fixed tip when target and append note are both empty Teng Long
2022-11-07 14:40 ` Ævar Arnfjörð Bjarmason
2022-11-07 21:51 ` Taylor Blau
2022-11-07 22:33 ` Ævar Arnfjörð Bjarmason
2022-11-07 22:45 ` Taylor Blau
2022-11-08 8:55 ` Teng Long
2022-11-07 13:57 ` [PATCH v2 3/3] notes.c: drop unreachable code in "append_edit()" Teng Long
2022-11-07 14:41 ` Ævar Arnfjörð Bjarmason
2022-11-07 14:57 ` [PATCH v2 0/3] notes.c: introduce "--blank-line" option Ævar Arnfjörð Bjarmason
2022-11-09 7:05 ` Teng Long
2022-11-09 7:06 ` Teng Long
2022-11-09 9:06 ` [PATCH v3 0/5] notes.c: introduce "--no-blank-line" option Teng Long
2022-11-09 9:06 ` [PATCH v3 1/5] notes.c: cleanup 'strbuf_grow' call in 'append_edit' Teng Long
2022-11-09 9:06 ` [PATCH v3 2/5] notes.c: cleanup for "designated init" and "char ptr init" Teng Long
2022-11-09 9:06 ` [PATCH v3 3/5] notes.c: drop unreachable code in 'append_edit()' Teng Long
2022-11-09 9:06 ` [PATCH v3 4/5] notes.c: provide tips when target and append note are both empty Teng Long
2022-11-09 9:06 ` [PATCH v3 5/5] notes.c: introduce "--no-blank-line" option Teng Long
2022-11-28 14:20 ` [PATCH v3 0/5] " Teng Long
2022-11-29 1:10 ` Junio C Hamano
2022-11-29 22:53 ` Taylor Blau
2022-11-29 12:57 ` Teng Long
2022-11-29 13:19 ` Junio C Hamano
2022-12-15 12:48 ` Teng Long
2022-12-19 3:03 ` Eric Sunshine
2022-12-21 9:16 ` Teng Long
2022-12-21 11:35 ` Junio C Hamano
2022-12-22 9:30 ` Teng Long
2022-12-23 1:36 ` Eric Sunshine
2023-01-12 2:48 ` [PATCH v4 0/5] notes.c: introduce "--separator" optio Teng Long
2023-01-12 2:48 ` [PATCH v4 1/5] notes.c: cleanup 'strbuf_grow' call in 'append_edit' Teng Long
2023-01-15 4:53 ` Eric Sunshine
2023-01-28 11:22 ` Teng Long
2023-01-12 2:48 ` [PATCH v4 2/5] notes.c: cleanup for "designated init" and "char ptr init" Teng Long
2023-01-12 9:51 ` Ævar Arnfjörð Bjarmason
2023-01-28 11:33 ` Teng Long
2023-01-12 2:48 ` [PATCH v4 3/5] notes.c: drop unreachable code in 'append_edit()' Teng Long
2023-01-15 20:59 ` Eric Sunshine
2023-01-15 21:10 ` Eric Sunshine
2023-01-28 11:50 ` Teng Long
2023-01-30 5:38 ` Eric Sunshine
2023-02-01 8:08 ` Teng Long
2023-01-12 2:48 ` [PATCH v4 4/5] notes.c: provide tips when target and append note are both empty Teng Long
2023-01-12 9:52 ` Ævar Arnfjörð Bjarmason
2023-01-15 21:28 ` Eric Sunshine
2023-01-12 2:48 ` [PATCH v4 5/5] notes.c: introduce "--separator" option Teng Long
2023-01-12 9:53 ` Ævar Arnfjörð Bjarmason
2023-01-15 22:04 ` Eric Sunshine
2023-01-15 22:15 ` Eric Sunshine
2023-02-16 13:05 ` [PATCH v5 0/3] " Teng Long
2023-02-16 13:05 ` [PATCH v5 1/3] notes.c: cleanup 'strbuf_grow' call in 'append_edit' Teng Long
2023-02-16 18:39 ` Junio C Hamano
2023-02-20 3:34 ` Teng Long
2023-02-16 13:05 ` [PATCH v5 2/3] notes.c: cleanup for "designated init" Teng Long
2023-02-16 18:39 ` Junio C Hamano
2023-02-16 13:05 ` [PATCH v5 3/3] notes.c: introduce "--separator" option Teng Long
2023-02-16 23:22 ` Junio C Hamano
2023-02-20 14:00 ` Teng Long
2023-02-21 21:31 ` Junio C Hamano
2023-02-22 8:17 ` Teng Long
2023-02-22 23:15 ` Junio C Hamano
2023-02-23 7:29 ` [PATCH v6 0/3] " Teng Long
2023-02-23 7:29 ` [PATCH v6 1/3] notes.c: cleanup 'strbuf_grow' call in 'append_edit' Teng Long
2023-02-23 7:29 ` [PATCH v6 2/3] notes.c: cleanup for "designated init" Teng Long
2023-02-23 7:29 ` [PATCH v6 3/3] notes.c: introduce '--separator=<paragraph-break>' option Teng Long
2023-02-23 18:21 ` Junio C Hamano
2023-02-28 14:11 ` Teng Long
2023-02-25 21:30 ` Junio C Hamano
2023-02-28 14:14 ` Teng Long
2023-03-27 13:13 ` [PATCH v6 0/3] notes.c: introduce "--separator" option Teng Long
2023-03-28 14:28 ` [PATCH v7 0/4] " Teng Long
2023-03-28 14:28 ` [PATCH v7 1/4] notes.c: cleanup 'strbuf_grow' call in 'append_edit' Teng Long
2023-03-28 14:28 ` [PATCH v7 2/4] notes.c: cleanup for "designated init" Teng Long
2023-03-29 22:17 ` Junio C Hamano
2023-03-28 14:28 ` [PATCH v7 3/4] notes.c: introduce '--separator=<paragraph-break>' option Teng Long
2023-03-28 15:37 ` Junio C Hamano
2023-03-29 14:15 ` Teng Long
2023-03-29 21:48 ` Junio C Hamano
2023-04-13 9:36 ` Teng Long
2023-03-28 14:28 ` [PATCH v7 4/4] notes.c: don't do stripespace when parse file arg Teng Long
2023-03-28 15:54 ` Junio C Hamano
2023-03-29 12:06 ` Teng Long
2023-03-29 16:21 ` Junio C Hamano
2023-04-25 13:34 ` [PATCH 0/6] notes.c: introduce "--separator" option Teng Long
2023-04-25 13:34 ` [PATCH v8 1/6] notes.c: cleanup 'strbuf_grow' call in 'append_edit' Teng Long
2023-04-25 13:34 ` [PATCH v8 2/6] notes.c: use designated initializers for clarity Teng Long
2023-04-25 13:34 ` [PATCH v8 3/6] t3321: add test cases about the notes stripspace behavior Teng Long
2023-04-25 16:25 ` Junio C Hamano
2023-04-27 3:47 ` Teng Long
2023-04-25 13:34 ` [PATCH v8 4/6] notes.c: introduce '--separator=<paragraph-break>' option Teng Long
2023-04-25 17:34 ` Junio C Hamano
2023-04-27 7:21 ` Teng Long
2023-04-27 18:21 ` Junio C Hamano
2023-04-25 17:35 ` Junio C Hamano
2023-04-25 13:34 ` [PATCH v8 5/6] notes.c: append separator instead of insert by pos Teng Long
2023-04-25 17:47 ` Junio C Hamano
2023-04-27 7:51 ` Teng Long
2023-04-25 13:34 ` [PATCH v8 6/6] notes.c: introduce "--[no-]stripspace" option Teng Long
2023-04-25 17:49 ` Junio C Hamano
2023-04-28 7:40 ` Teng Long
2023-04-28 18:21 ` Junio C Hamano
2023-04-28 9:23 ` Teng Long [this message]
2023-04-28 9:23 ` [PATCH v9 1/6] notes.c: cleanup 'strbuf_grow' call in 'append_edit' Teng Long
2023-04-28 9:23 ` [PATCH v9 2/6] notes.c: use designated initializers for clarity Teng Long
2023-04-28 9:23 ` [PATCH v9 3/6] t3321: add test cases about the notes stripspace behavior Teng Long
2023-04-28 9:23 ` [PATCH v9 4/6] notes.c: introduce '--separator=<paragraph-break>' option Teng Long
2023-04-28 20:44 ` Junio C Hamano
2023-05-06 9:12 ` Teng Long
2023-05-06 9:22 ` Teng Long
2023-05-10 19:19 ` Kristoffer Haugsbakk
2023-05-12 4:07 ` Teng Long
2023-05-12 7:29 ` Kristoffer Haugsbakk
2023-05-16 17:00 ` Junio C Hamano
2023-05-17 3:58 ` Teng Long
2023-05-17 15:32 ` Junio C Hamano
2023-06-14 1:02 ` Junio C Hamano
2023-06-14 1:10 ` [PATCH] notes: do not access before the beginning of an array Junio C Hamano
2023-06-14 1:41 ` [PATCH v9 4/6] notes.c: introduce '--separator=<paragraph-break>' option Eric Sunshine
2023-06-14 2:07 ` Junio C Hamano
2023-06-15 7:13 ` Jeff King
2023-06-15 19:15 ` Junio C Hamano
2023-06-19 6:08 ` Teng Long
2023-06-20 20:36 ` Junio C Hamano
2023-06-21 2:50 ` Teng Long
2023-04-28 9:23 ` [PATCH v9 5/6] notes.c: append separator instead of insert by pos Teng Long
2023-04-28 9:23 ` [PATCH v9 6/6] notes.c: introduce "--[no-]stripspace" option Teng Long
2023-04-28 20:46 ` [PATCH v9 0/6] notes.c: introduce "--separator" option Junio C Hamano
2023-05-01 22:29 ` Junio C Hamano
2023-05-18 12:02 ` [PATCH v10 " Teng Long
2023-05-18 12:02 ` [PATCH v10 1/6] notes.c: cleanup 'strbuf_grow' call in 'append_edit' Teng Long
2023-05-18 12:02 ` [PATCH v10 2/6] notes.c: use designated initializers for clarity Teng Long
2023-05-18 12:02 ` [PATCH v10 3/6] t3321: add test cases about the notes stripspace behavior Teng Long
2023-05-18 12:02 ` [PATCH v10 4/6] notes.c: introduce '[--[no-]separator|--separator=<paragraph-break>]' option Teng Long
2023-05-18 14:34 ` Kristoffer Haugsbakk
2023-05-20 10:41 ` Teng Long
2023-05-20 16:12 ` Kristoffer Haugsbakk
2023-05-19 0:54 ` Jeff King
2023-05-27 7:17 ` Teng Long
2023-05-27 17:19 ` Jeff King
2023-05-29 11:48 ` Teng Long
2023-05-18 12:02 ` [PATCH v10 5/6] notes.c: append separator instead of insert by pos Teng Long
2023-05-18 12:02 ` [PATCH v10 6/6] notes.c: introduce "--[no-]stripspace" option Teng Long
2023-05-18 13:56 ` [PATCH v10 0/6] notes.c: introduce "--separator" option Kristoffer Haugsbakk
2023-05-20 10:22 ` Teng Long
2023-05-18 15:17 ` Junio C Hamano
2023-05-20 10:59 ` Teng Long
2023-05-27 7:57 ` [PATCH v11 0/7] notes.c: introduce "--separator" Teng Long
2023-05-27 7:57 ` [PATCH v11 1/7] notes.c: cleanup 'strbuf_grow' call in 'append_edit' Teng Long
2023-05-27 7:57 ` [PATCH v11 2/7] notes.c: use designated initializers for clarity Teng Long
2023-05-27 7:57 ` [PATCH v11 3/7] t3321: add test cases about the notes stripspace behavior Teng Long
2023-05-27 7:57 ` [PATCH v11 4/7] notes.c: introduce '--separator=<paragraph-break>' option Teng Long
2023-05-27 7:57 ` [PATCH v11 5/7] notes.c: append separator instead of insert by pos Teng Long
2023-05-27 7:57 ` [PATCH v11 6/7] notes.c: introduce "--[no-]stripspace" option Teng Long
2023-05-27 7:57 ` [PATCH v11 7/7] notes: introduce "--no-separator" option Teng Long
2023-06-01 5:50 ` [PATCH v11 0/7] notes.c: introduce "--separator" Junio C Hamano
2023-06-03 10:01 ` Teng Long
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1682671758.git.dyroneteng@gmail.com \
--to=dyroneteng@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
--cc=tenglong.tl@alibaba-inc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).