Re: [Libcdio-devel] Proposal for fix of cd-info on MSWindows driver

[Thomas Schmitt]

Hi,

Pete Batard wrote:
> That's called squashing. You should be able to find plenty of help on how to
> do that using git rebase, such as https://gist.github.com/jbub/5766366

Ok. I'm now squashed at git push.
Question is whether i should push with --force or --force-with-lease.

-----------------------------------------------------------------------
Long story:

After
  git rebase --interactive HEAD~2
the editor shows

  pick a42d093 Fixed win32 implementation of .get_track_msf() for CD with first 
track number > 1
  pick c3a8f8a Applied Pete Batard's corrections to previous commit

  # Rebase 486e03d..c3a8f8a onto 486e03d
  # ... more memory aids for people who understand them ...

I decided to go by the man page which advises to change the second
"pick" to "fixup" in the hope to remove its commit message from the
resulting commit.

  pick a42d093 Fixed win32 implementation of .get_track_msf() for CD with first 
track number > 1
  fixup c3a8f8a Applied Pete Batard's corrections to previous commit

The man page says that the text after the commit id is purely ornamental.

I leave the editor and allow it to store at the proposed file name.
The git run then ends by

  [detached HEAD b0acdfc] Fixed win32 implementation of .get_track_msf() for CD 
with first track number > 1
  Date: Wed May 20 22:48:29 2020 +0200
   1 file changed, 6 insertions(+), 3 deletions(-)
  Successfully rebased and updated refs/heads/win32_first_tno_fix.

Now git log says:

  commit b0acdfc0c39c2d39d5e847590cc7550ca7f8eb0f
  Author: Thomas Schmitt <address@hidden>
  Date:   Wed May 20 22:48:29 2020 +0200

    Fixed win32 implementation of .get_track_msf() for CD with first track 
number > 1

  commit 486e03d627fc51554802cbd71bfb1911c6b43ff4
  Author: Pete Batard <address@hidden>
  Date:   Wed May 20 18:50:55 2020 +0100
  ...

Looks good. So i push.
Well, i try at least:

  To address@hidden:/srv/git/libcdio.git
   ! [rejected]        win32_first_tno_fix -> win32_first_tno_fix 
(non-fast-forward)
  error: failed to push some refs to 'address@hidden:/srv/git/libcdio.git'
  hint: Updates were rejected because the tip of your current branch is behind
  hint: its remote counterpart. Integrate the remote changes (e.g.
  hint: 'git pull ...') before pushing again.
  hint: See the 'Note about fast-forwards' in 'git push --help' for details.

I don't see any other commits in
  http://git.savannah.gnu.org/cgit/libcdio.git/log/?h=win32_first_tno_fix
after the two which i now squashed.

What will happen to my pumpkin if i do the advised git pull ?

Git tutorials advise to push with --force or --force-with-lease.
But how old are the authors ? Is this their trick to get rid of me ?
For example: What will happen to the rebased candle in
   
https://res.cloudinary.com/practicaldev/image/fetch/s--InTOasci--/c_limit%2Cf_auto%2Cfl_progressive%2Cq_auto%2Cw_880/https://thepracticaldev.s3.amazonaws.com/i/7qzryt6xov0hcsmek83n.jpg
given that both flames are still burning. ? :))


So what shall i do now ?
(There is always the option to create a new branch, copy win32.c to it,
 and make one good commit.)


Have a nice day :)

Thomas