From: Junio C Hamano <email@example.com> To: Phillip Wood <firstname.lastname@example.org> Cc: email@example.com, Stefan Beller <firstname.lastname@example.org> Subject: Re: What's cooking in git.git (Oct 2018, #01; Wed, 10) Date: Fri, 12 Oct 2018 07:40:59 +0900 Message-ID: <email@example.com> (raw) In-Reply-To: <firstname.lastname@example.org> Phillip Wood <email@example.com> writes: > On 10/10/2018 06:43, Junio C Hamano wrote: >> Here are the topics that have been cooking. Commits prefixed with >> '-' are only in 'pu' (proposed updates) while commits prefixed with >> '+' are in 'next'. The ones marked with '.' do not appear in any of >> the integration branches, but I am still holding onto them. >> >> * pw/diff-color-moved-ws-fix (2018-10-04) 5 commits >> - diff --color-moved: fix a memory leak >> - diff --color-moved-ws: fix another memory leak >> - diff --color-moved-ws: fix a memory leak >> - diff --color-moved-ws: fix out of bounds string access >> - diff --color-moved-ws: fix double free crash >> >> Various fixes to "diff --color-moved-ws". >> >> What's the status of this topic? > > I think it is ready for next - Stefan was happy with the last iteration. This is not about your fixes, but I was skimming the color-moved support in general as a final sanity check to move this forward and noticed that $ git diff --color-moved-ws=ignore-any master... does not do anything interesting, which is broken at at least two points. * There is no "ignore-any" supported by the feature---I think that the parser for the option should have noticed and barfed, but it did not. It merely emitted a message to the standard output and let it scroll away with the huge diff before the reader noticed it. * After fixing ignore-any to one of the supported option (e.g. "ignore-all-spaces"), the color-moved feature still did not trigger. I think the presence of --color-moved-ws by itself is a hint that the user wants --color-moved to be used. If it turns out that there are some valid use cases where --color-moved-ws may have to be set but the color-moved feature should not be enabled, then diff --color-moved-ws=ignore-all-space --no-color-moved can be used to countermand this, of course. Am I missing something or are these mere small sloppiness in the current code?
next prev parent reply index Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-10 5:43 Junio C Hamano 2018-10-10 7:59 ` Ævar Arnfjörð Bjarmason 2018-10-10 15:06 ` Jeff King 2018-10-10 12:57 ` builtin stash/rebase, was " Johannes Schindelin 2018-10-10 13:19 ` Junio C Hamano 2018-10-11 2:18 ` Junio C Hamano 2018-10-10 13:04 ` js/mingw-wants-vista-or-above, " Johannes Schindelin 2018-10-10 13:13 ` Junio C Hamano 2018-10-10 13:58 ` Phillip Wood 2018-10-11 1:54 ` Junio C Hamano 2018-10-11 22:40 ` Junio C Hamano [this message] 2018-10-11 22:59 ` [PATCH] diff.c: die on unknown color-moved ws mode Stefan Beller 2018-10-11 23:01 ` Stefan Beller 2018-10-12 1:22 ` Junio C Hamano 2018-10-11 23:06 ` What's cooking in git.git (Oct 2018, #01; Wed, 10) Stefan Beller 2018-10-12 0:51 ` Junio C Hamano 2018-10-12 9:59 ` Phillip Wood 2018-10-12 13:36 ` Junio C Hamano 2018-10-16 13:38 ` Phillip Wood 2018-10-16 17:13 ` Stefan Beller 2018-10-10 14:18 ` Thomas Gummerer 2018-10-11 1:40 ` Junio C Hamano 2018-10-10 18:51 ` `--rebase-merges' still failing badly Michael Witten 2018-10-10 19:00 ` Michael Witten 2018-10-10 23:01 ` Junio C Hamano 2018-10-11 2:44 ` Michael Witten 2018-10-12 9:11 ` Johannes Schindelin 2018-10-10 18:55 ` What's cooking in git.git (Oct 2018, #01; Wed, 10) Stefan Beller 2018-10-11 2:00 ` Junio C Hamano 2018-10-10 20:38 ` Tim Schumacher 2018-10-10 21:25 ` Johannes Sixt 2018-10-11 1:53 ` Junio C Hamano 2018-10-11 11:16 ` Derrick Stolee 2018-10-14 12:21 ` Duy Nguyen
Reply instructions: You may reply publically 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 \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ /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
email@example.com mailing list mirror (one of many) Archives are clonable: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.org/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ or Tor2web: https://www.tor2web.org/ AGPL code for this site: git clone https://public-inbox.org/ public-inbox