Re: [Plplot-devel] git blog

[Arjen M. <Arj...@de...>]

Hi Alan,

> -----Original Message-----
> From: Alan W. Irwin [mailto:ir...@be...]
> Sent: Wednesday, March 16, 2016 6:28 PM
> To: Arjen Markus
> Cc: PLplot development list
> Subject: RE: git blog
>
> On 2016-03-16 09:12-0000 Arjen Markus wrote:
>
> > Hi Alan,
> >
> >
> >
> >> -----Original Message-----
> >> From: Alan W. Irwin [mailto:ir...@be...]
> >> Sent: Wednesday, March 16, 2016 10:08 AM
> >> To: Arjen Markus
> >> Cc: PLplot development list
> >> Subject: git blog
> >>
> >> On 2016-03-16 08:04-0000 Arjen Markus wrote:
> >>
> >>> By the way, your most recent commits did not show up in the log. But
> >> when I did "git merge -ff-only origin/master" I did get the changes.
> >> Very odd.
> >>
> >> Probably not that odd.  "git log" generates the log _for the current
> >> branch_.  So if you had checked out master branch, and invoked "git
> >> log" it would not show the recent commits downloaded to origin/master
> >> by "git fetch".  In other words origin/master and master are two
> >> quite distinct branches; the first is populated by "git fetch", the
> >> second by fast forwarding (at least with our workflow) from some
> >> other local branch (such as origin/master or some topic branch) to master.  That
> is why master has no merge commits and therefore a very clean-looking history.
> >> Which allows you to "git push origin master" from that branch (which
> >> fast forwards to both origin/master and the master branch at SF) and propagate
> that linear history.
> >>
> >
> >
> > Hm, I never noticed that before and it probably means that our receipe is not
> quite correct or correctly described in terms of what you can expect:
> >
> > 2. Updating the master branch:
> >
> >   $ git checkout master
> >
> >   $ git fetch
> >
> >   (optional) review newly downloaded changes
> >
> >   $ git log origin/master
> >
> >   $ git merge --ff-only origin/master
> >
> >
> >
> > Using this receipe, I have always expected to see the latest commits (as retrieved
> by "git fetch") in the log.
>
> The above recipe is absolutely correct.
>
> However, if you specify the branch (e.g., "git log origin/master") it will show commits
> on that branch, but if you don't specify the branch (e.g., "git log") it will show
> commits on the branch that is checked out.  So my guess is you forgot to specify
> origin/master for the above git log command, i.e.,
>
Ah, that must have been it then, that sounds reasonable indeed.

Regards,

Arjen



DISCLAIMER: This message is intended exclusively for the addressee(s) and may contain confidential and privileged information. If you are not the intended recipient please notify the sender immediately and destroy this message. Unauthorized use, disclosure or copying of this message is strictly prohibited. The foundation 'Stichting Deltares', which has its seat at Delft, The Netherlands, Commercial Registration Number 41146461, is not liable in any way whatsoever for consequences and/or damages resulting from the improper, incomplete and untimely dispatch, receipt and/or content of this e-mail.