Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi team, especially Stefan: your thorough investigation about a better name than range-diff gives me confidence that my decision to retract my objection against has merit: it seems to be by far the one name that everybody but me agrees on. And I can adapt easily. On Sat, 26 May 2018, Øyvind

Fwd: [PATCH v2 02/18] Add a new builtin: branch-diff

Just want to throw my support in for range-diff since ranges is what you pass to the command. Alternatively, diff-diff since that's how I've crudely tried to accomplish this before. git diff A..B > diff1 git diff C..D > diff2 winmerge diff1 diff2

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Johannes, On IRC you wrote: And BTW this is not bike-shedding to me. Discussing the name of a variable, or indentation, or line wrapping, is. But improving the user experience is important. We *suck* on that, historically, and I do want to break with that habit. ... avar, _ikke_: so a colleague

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

On Tue, May 08 2018, Jeff King wrote: > On Mon, May 07, 2018 at 03:24:59PM -0700, Stefan Beller wrote: > >> Hence I propose "git range-diff", similar to topic-diff, that >> was proposed earlier. >> >> * it "diffs ranges" of commits. >> * it can also deal with out-of-git things like patch series,

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Jeff King writes: >> I haven't really been following all of the discussion but from what I >> can tell the point of this command is to generate a diff based on two >> different versions of a series, so why not call it 'series-diff'? :) > > That's OK with me, though I prefer

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

On Mon, May 21, 2018 at 02:40:57PM -0700, Brandon Williams wrote: > > > > Most fellow German software engineers (who seem to have a knack for > > > > idiotically long variable/function names) would now probably suggest: > > > > > > > > git compare-patch-series-with-revised-patch-series >

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

On Mon, May 21, 2018 at 2:40 PM, Brandon Williams wrote: revised-compare >> > >> > diff-revise > > I haven't really been following all of the discussion but from what I > can tell the point of this command is to generate a diff based on two > different versions of a series,

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

On 05/21, Jeff King wrote: > On Mon, May 21, 2018 at 10:56:47AM -0700, Stefan Beller wrote: > > > > It is very much about > > > comparing two *ranges of* revisions, and not just any ranges, no. Those > > > ranges need to be so related as to contain mostly identical changes. > > > > range-diff,

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

On Mon, May 21, 2018 at 10:56:47AM -0700, Stefan Beller wrote: > > It is very much about > > comparing two *ranges of* revisions, and not just any ranges, no. Those > > ranges need to be so related as to contain mostly identical changes. > > range-diff, eh? > > > Most fellow German software

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Johannes, >> (2) git diff --branch topic-v1...topic-v2 > > From my point of view, `git diff --branch` indicates that I diff > *branches*. Which is not really something that makes sense, and definitely > not what this command is about. > > We are not comparing branches. > > We are comparing

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Junio, On Tue, 8 May 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > It would be easy to introduce, but I am wary about its usefulness. > > Unless you re-generate the branch from patches (which I guess you do a > > lot, but I don't), you are

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Buga, On Mon, 7 May 2018, Igor Djordjevic wrote: > On 07/05/2018 09:48, Jeff King wrote: > > > > > > Let's, please, not fall into the trap of polluting git-branch with > > > > utterly unrelated functionality, as has happened a few times with > > > > other Git commands. Let's especially not

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

On Mon, May 07, 2018 at 11:44:29PM -0400, Jeff King wrote: > On Mon, May 07, 2018 at 03:24:59PM -0700, Stefan Beller wrote: > > > Hence I propose "git range-diff", similar to topic-diff, that > > was proposed earlier. > > > > * it "diffs ranges" of commits. > > * it can also deal with

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

On Mon, May 07, 2018 at 03:24:59PM -0700, Stefan Beller wrote: > Hence I propose "git range-diff", similar to topic-diff, that > was proposed earlier. > > * it "diffs ranges" of commits. > * it can also deal with out-of-git things like patch series, > but that is a mere by product and may not

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Jeff King writes: > One of the things I don't like about "git branch --diff" is that this > feature is not _just_ about branches at all. I actually wouldn't be that much against the word "branch" in "branch-diff" on the ground that we are typically not feeding branches to the

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Stefan, On 08/05/2018 00:24, Stefan Beller wrote: > > > List, rename, delete -- all these seem more as basic CRUD operations, > > where comparison is a more complex one. And not to get me wrong - I > > could see "branch diff" being part of "branch", but not really when > > "diff" already

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

On Mon, May 7, 2018 at 3:05 PM, Igor Djordjevic wrote: > List, rename, delete -- all these seem more as basic CRUD operations, > where comparison is a more complex one. And not to get me wrong - I > could see "branch diff" being part of "branch", but not really when

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Dscho, On 07/05/2018 03:34, Johannes Schindelin wrote: > > > > I think Todd's idea to shift it from a full-blown builtin to a cmdmode > > > of `branch` makes tons of sense. > > > > I don`t know, I still find it a bit strange that in order to "diff > > something", you go to "something" and

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

On 07/05/2018 09:48, Jeff King wrote: > > > > Let's, please, not fall into the trap of polluting git-branch with > > > utterly unrelated functionality, as has happened a few times with > > > other Git commands. Let's especially not do so merely for the sake of > > > tab-completion. git-branch is

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

On Mon, May 7, 2018 at 8:28 AM, Duy Nguyen wrote: >>> I do hear you. Especially since I hate `git cherry` every single time that >>> I try to tab-complete `git cherry-pick`. >> >> Me too. :) > > Just so you know I'm also not happy with that "git cherry". Since I'm > updating

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

On Mon, May 7, 2018 at 9:50 AM, Jeff King wrote: > On Sat, May 05, 2018 at 11:57:26PM +0200, Johannes Schindelin wrote: > >> > It feels really petty complaining about the name, but I just want to >> > raise the point, since it will never be easier to change than right now. >> >> I

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Johannes Schindelin writes: > It would be easy to introduce, but I am wary about its usefulness. > Unless you re-generate the branch from patches (which I guess you do a > lot, but I don't), you are likely to compare incomplete patch series: say, > when you call `git

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

On Sat, May 05, 2018 at 11:57:26PM +0200, Johannes Schindelin wrote: > > It feels really petty complaining about the name, but I just want to > > raise the point, since it will never be easier to change than right now. > > I do hear you. Especially since I hate `git cherry` every single time

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

On Sun, May 06, 2018 at 10:04:31PM -0400, Johannes Schindelin wrote: > > Let's, please, not fall into the trap of polluting git-branch with > > utterly unrelated functionality, as has happened a few times with > > other Git commands. Let's especially not do so merely for the sake of > >

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Junio, On Mon, 7 May 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> If tbdiff were "Thomas's branch diff", I would call this jbdiff ;-) > >> but I think the 't' in there stands for "topic", not "Thomas's". > >> > >> How about "git topic-diff"?

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Eric, On Sun, 6 May 2018, Eric Sunshine wrote: > On Sun, May 6, 2018 at 8:21 AM, Johannes Schindelin > wrote: > > On Sun, 6 May 2018, Junio C Hamano wrote: > >> Johannes Schindelin writes: > >> > On Sat, 5 May 2018, Jeff King wrote: >

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Johannes Schindelin writes: >> If tbdiff were "Thomas's branch diff", I would call this jbdiff ;-) >> but I think the 't' in there stands for "topic", not "Thomas's". >> >> How about "git topic-diff"? > > Or `git topic-branch-diff`? Yeah something along that line,

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Buga, On Sun, 6 May 2018, Igor Djordjevic wrote: > On 06/05/2018 14:10, Johannes Schindelin wrote: > > > I think Todd's idea to shift it from a full-blown builtin to a cmdmode > > of `branch` makes tons of sense. > > I don`t know, I still find it a bit strange that in order to "diff >

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

On Sun, May 6, 2018 at 8:21 AM, Johannes Schindelin wrote: > On Sun, 6 May 2018, Junio C Hamano wrote: >> Johannes Schindelin writes: >> > On Sat, 5 May 2018, Jeff King wrote: >> >> One minor point about the name: will it become annoying as

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Dscho, On 06/05/2018 14:10, Johannes Schindelin wrote: > > > > > > This builtin does not do a whole lot so far, apart from showing a > > > > > usage that is oddly similar to that of `git tbdiff`. And for a > > > > > good reason: the next commits will turn `branch-diff` into a > > > > >

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Junio, On Sun, 6 May 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Sat, 5 May 2018, Jeff King wrote: > > > >> On Fri, May 04, 2018 at 05:34:32PM +0200, Johannes Schindelin wrote: > >> > >> > This builtin does not do a whole lot so far, apart

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Buga, On Sun, 6 May 2018, Igor Djordjevic wrote: > On 05/05/2018 23:57, Johannes Schindelin wrote: > > > > > > This builtin does not do a whole lot so far, apart from showing a > > > > usage that is oddly similar to that of `git tbdiff`. And for a > > > > good reason: the next commits will

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Duy, On Sun, 6 May 2018, Duy Nguyen wrote: > On Sun, May 6, 2018 at 6:53 AM, Jacob Keller wrote: > > On Sat, May 5, 2018 at 6:05 PM, Igor Djordjevic > > wrote: > >> > >> On 05/05/2018 23:57, Johannes Schindelin wrote: > >>> > >>> > > This

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Todd, On Sat, 5 May 2018, Todd Zullinger wrote: > I wrote: > > Would it be possible and reasonable to teach 'git branch' to > > call this as a subcommand, i.e. as 'git branch diff'? Then > > the completion wouldn't offer git branch-diff. > > Of course right after I sent this, it occurred to

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

On Sun, May 6, 2018 at 6:53 AM, Jacob Keller wrote: > On Sat, May 5, 2018 at 6:05 PM, Igor Djordjevic > wrote: >> Hi Dscho, >> >> On 05/05/2018 23:57, Johannes Schindelin wrote: >>> >>> > > This builtin does not do a whole lot so far, apart

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

On Sat, May 5, 2018 at 6:05 PM, Igor Djordjevic wrote: > Hi Dscho, > > On 05/05/2018 23:57, Johannes Schindelin wrote: >> >> > > This builtin does not do a whole lot so far, apart from showing a >> > > usage that is oddly similar to that of `git tbdiff`. And for a >>

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Johannes Schindelin writes: > Hi Peff, > > On Sat, 5 May 2018, Jeff King wrote: > >> On Fri, May 04, 2018 at 05:34:32PM +0200, Johannes Schindelin wrote: >> >> > This builtin does not do a whole lot so far, apart from showing a usage >> > that is oddly similar to

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Dscho, On 05/05/2018 23:57, Johannes Schindelin wrote: > > > > This builtin does not do a whole lot so far, apart from showing a > > > usage that is oddly similar to that of `git tbdiff`. And for a > > > good reason: the next commits will turn `branch-diff` into a > > > full-blown replacement

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

I wrote: > Would it be possible and reasonable to teach 'git branch' to > call this as a subcommand, i.e. as 'git branch diff'? Then > the completion wouldn't offer git branch-diff. Of course right after I sent this, it occurred to me that 'git branch diff' would make mask the ability to create

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Johannes, Johannes Schindelin wrote: > On Sat, 5 May 2018, Jeff King wrote: >> One minor point about the name: will it become annoying as a tab >> completion conflict with git-branch? > > I did mention this in the commit message of 18/18: > > Without this patch, we would only complete

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

Hi Peff, On Sat, 5 May 2018, Jeff King wrote: > On Fri, May 04, 2018 at 05:34:32PM +0200, Johannes Schindelin wrote: > > > This builtin does not do a whole lot so far, apart from showing a usage > > that is oddly similar to that of `git tbdiff`. And for a good reason: > > the next commits will

Re: [PATCH v2 02/18] Add a new builtin: branch-diff

On Fri, May 04, 2018 at 05:34:32PM +0200, Johannes Schindelin wrote: > This builtin does not do a whole lot so far, apart from showing a usage > that is oddly similar to that of `git tbdiff`. And for a good reason: > the next commits will turn `branch-diff` into a full-blown replacement > for

[PATCH v2 02/18] Add a new builtin: branch-diff

This builtin does not do a whole lot so far, apart from showing a usage that is oddly similar to that of `git tbdiff`. And for a good reason: the next commits will turn `branch-diff` into a full-blown replacement for `tbdiff`. At this point, we ignore tbdiff's color options as well as the