# [PATCH 0/3] cleanup for 'dl/range-diff-with-notes' 4 messages from 2019-12-06 to 2019-12-06. Participants: Denton Liu. Thread: https://gitlist.dev/t/52395 ## Denton Liu, 2019-12-06 20:16 Subject: [PATCH 0/3] cleanup for 'dl/range-diff-with-notes' Message-ID: URL: https://gitlist.dev/e/cover.1575663345.git.liu.denton%40gmail.com ``` This series performs some small polishing touches for the 'dl/range-diff-with-notes' topic. Notably, we fix an incorrect test case name but we also perform some nit-picky cleanup for the range-diff code. Denton Liu (3): t3206: fix incorrect test name range-diff: mark pointers as const range-diff: clear `other_arg` at end of function builtin/range-diff.c | 1 + range-diff.c | 6 +++--- range-diff.h | 4 ++-- t/t3206-range-diff.sh | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) -- 2.24.0.612.g9b7bad38f5 ``` ## Denton Liu, 2019-12-06 20:16 Subject: [PATCH 1/3] t3206: fix incorrect test name Message-ID: <766adb34858c39c446dc9d0211c3f9b34693b99e.1575663345.git.liu.denton@gmail.com> URL: https://gitlist.dev/e/766adb34858c39c446dc9d0211c3f9b34693b99e.1575663345.git.liu.denton%40gmail.com In-Reply-To: ``` The name of the test used to indicate that it was testing the `--notes` option but it was really testing the `format.notes` configuration. Correct the test name to reflect this. Signed-off-by: Denton Liu --- t/t3206-range-diff.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh index ec2b456dbb..0575dd72b1 100755 --- a/t/t3206-range-diff.sh +++ b/t/t3206-range-diff.sh @@ -638,7 +638,7 @@ test_expect_success 'format-patch --range-diff with --notes' ' test_cmp expect actual ' -test_expect_success 'format-patch --range-diff with --notes' ' +test_expect_success 'format-patch --range-diff with format.notes config' ' git notes add -m "topic note" topic && git notes add -m "unmodified note" unmodified && test_when_finished git notes remove topic unmodified && -- 2.24.0.612.g9b7bad38f5 ``` ## Denton Liu, 2019-12-06 20:16 Subject: [PATCH 2/3] range-diff: mark pointers as const Message-ID: <159516cf99c445604d82d8760e8d2f7497db05a5.1575663345.git.liu.denton@gmail.com> URL: https://gitlist.dev/e/159516cf99c445604d82d8760e8d2f7497db05a5.1575663345.git.liu.denton%40gmail.com In-Reply-To: ``` The contents pointed to by `diffopt` and `other_arg` should not be modified. Mark these as `const` to indicate this. Signed-off-by: Denton Liu --- range-diff.c | 6 +++--- range-diff.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/range-diff.c b/range-diff.c index f56b4012a2..f745567cf6 100644 --- a/range-diff.c +++ b/range-diff.c @@ -41,7 +41,7 @@ static size_t find_end_of_line(char *buffer, unsigned long size) * as struct object_id (will need to be free()d). */ static int read_patches(const char *range, struct string_list *list, - struct argv_array *other_arg) + const struct argv_array *other_arg) { struct child_process cp = CHILD_PROCESS_INIT; struct strbuf buf = STRBUF_INIT, contents = STRBUF_INIT; @@ -506,8 +506,8 @@ static struct strbuf *output_prefix_cb(struct diff_options *opt, void *data) int show_range_diff(const char *range1, const char *range2, int creation_factor, int dual_color, - struct diff_options *diffopt, - struct argv_array *other_arg) + const struct diff_options *diffopt, + const struct argv_array *other_arg) { int res = 0; diff --git a/range-diff.h b/range-diff.h index 7d918ab9ed..381d52f4d3 100644 --- a/range-diff.h +++ b/range-diff.h @@ -13,7 +13,7 @@ */ int show_range_diff(const char *range1, const char *range2, int creation_factor, int dual_color, - struct diff_options *diffopt, - struct argv_array *other_arg); + const struct diff_options *diffopt, + const struct argv_array *other_arg); #endif -- 2.24.0.612.g9b7bad38f5 ``` ## Denton Liu, 2019-12-06 20:16 Subject: [PATCH 3/3] range-diff: clear `other_arg` at end of function Message-ID: URL: https://gitlist.dev/e/a2bb9b74184a1c09b416d70c14945e336f6e717f.1575663345.git.liu.denton%40gmail.com In-Reply-To: ``` We were leaking memory by not clearing `other_arg` after we were done using it. Clear it after we've finished using it. Note that this isn't strictly necessary since the memory will be reclaimed once the command exits. However, since we are releasing the strbufs, we should also clear `other_arg` for consistency. Signed-off-by: Denton Liu --- builtin/range-diff.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/range-diff.c b/builtin/range-diff.c index 98acf3533e..d8a4670629 100644 --- a/builtin/range-diff.c +++ b/builtin/range-diff.c @@ -84,6 +84,7 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix) res = show_range_diff(range1.buf, range2.buf, creation_factor, simple_color < 1, &diffopt, &other_arg); + argv_array_clear(&other_arg); strbuf_release(&range1); strbuf_release(&range2); -- 2.24.0.612.g9b7bad38f5 ```