From 4c35f0dbc41a2bb79e4f597d3b7bdb265c5ea750 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 8 Apr 2010 15:49:08 -0400 Subject: [PATCH 1/2] docs: clarify "branch -l" This option is mostly useless these days because we turn on reflogs by default in non-bare repos. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- Documentation/git-branch.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 6b6c3da2d9..b3605c0ec5 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -72,6 +72,8 @@ OPTIONS Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as "@\{yesterday}". + Note that in non-bare repositories, reflogs are usually + enabled by default by the `core.logallrefupdates` config option. -f:: --force:: From aed6ca52e73a35d0aac9aba7d631e09983e46a6f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 8 Apr 2010 23:30:49 -0700 Subject: [PATCH 2/2] diff.c: work around pointer constness warnings The textconv leak fix introduced two invocations of free() to release memory pointed by "const char *", which get annoying compiler warning. --- diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/diff.c b/diff.c index db2cd5d35f..c23093d6c0 100644 --- a/diff.c +++ b/diff.c @@ -551,9 +551,9 @@ static void emit_rewrite_diff(const char *name_a, if (lc_b) emit_rewrite_lines(&ecbdata, '+', data_two, size_two); if (textconv_one) - free(data_one); + free((char *)data_one); if (textconv_two) - free(data_two); + free((char *)data_two); } struct diff_words_buffer {