On Sat, Aug 6, 2016 at 12:55 AM, Volker Braun <vbraun.n...@gmail.com> wrote: > Since cgit doesn't know when you want the diff to start it can't really > display anything more useful. > > You can add e.g. &id2=develop to the URL to specify the starting point, e.g. > > https://git.sagemath.org/sage.git/diff/?h=e5fc48064b490ac4e4bdc432885b38c0eaea3e27&id2=develop
Thanks -- in this case that is perfect, and often that will be all that is needed. Is there any chance we could add a link to provide &id2=develop, since it's a little hard to remember...? > > Though really you want to know "what would be added if the ticket were > merged right now" which is, in general, not a single git query (for starters > merge can fail but git can diff anything). This is what clicking on the > branch in trac does. > > > > On Saturday, August 6, 2016 at 8:35:25 AM UTC+2, William wrote: >> >> Hi, >> >> Trac's "diff" tab is really weird to me. >> >> 1. Go to a ticket like https://trac.sagemath.org/ticket/20857 >> 2. Click on "commits", in this case seeing a log with two commits. >> 3. Click on the "diff" tab. >> >> The result is the diff *only* from the very last commit. It's not the >> diff showing what the two commits do. That's weird. >> >> In contrast, in Github if you >> >> 1. Visit a pull request with multiple commits, e.g., >> https://github.com/sagemathinc/smc/pull/783 >> 2. Click on "Files changed", e.g., >> https://github.com/sagemathinc/smc/pull/783/files >> >> you get a single nice view showing what the collection of commits changes. >> >> Obviously, I know how on the command line using git to view the diff >> between any two trees given by sha1 hashes... I'm just talking about >> using the web interfaces. >> >> -- William > > -- > You received this message because you are subscribed to the Google Groups > "sage-devel" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to sage-devel+unsubscr...@googlegroups.com. > To post to this group, send email to sage-devel@googlegroups.com. > Visit this group at https://groups.google.com/group/sage-devel. > For more options, visit https://groups.google.com/d/optout. -- William (http://wstein.org) -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at https://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
