Commit mistake?

Commit mistake?

[Stephen Berman]

I just committed a fix for bug#33423 to master (29ef7d1), and somehow
the commit included an entire unrelated file, nt/gnulib.mk.  I don't
know how this happened, because that is a file I'm not aware of ever
having touched, let alone changed (it's a generated file).  I don't know
if this is a problem but if it is, can someone who knows what to do
please take care of it, or tell me how to?  And also tell me how to
avoid a possible reoccurrence of in future commits?  Thanks and sorry
for the nuisance.

Steve Berman

Re: Commit mistake?

[Eli Zaretskii]

> From: Stephen Berman <stephen.berman@gmx.net>
> Date: Sun, 25 Nov 2018 14:22:13 +0100
> 
> I just committed a fix for bug#33423 to master (29ef7d1), and somehow
> the commit included an entire unrelated file, nt/gnulib.mk.  I don't
> know how this happened, because that is a file I'm not aware of ever
> having touched, let alone changed (it's a generated file).  I don't know
> if this is a problem but if it is, can someone who knows what to do
> please take care of it, or tell me how to?

Just delete that file, it should not be in the repository.  "git rm"
etc. (Let me know if you need more detailed instructions.)

> And also tell me how to avoid a possible reoccurrence of in future
> commits?  Thanks and sorry for the nuisance.

The only reliable way I know of is to say "git show" after committing
and before pushing, and review the diffs carefully making sure the
commit only includes what I meant it to.

Re: Commit mistake?

[Stephen Berman]

On Sun, 25 Nov 2018 18:34:50 +0200 Eli Zaretskii <eliz@gnu.org> wrote:

>> From: Stephen Berman <stephen.berman@gmx.net>
>> Date: Sun, 25 Nov 2018 14:22:13 +0100
>> 
>> I just committed a fix for bug#33423 to master (29ef7d1), and somehow
>> the commit included an entire unrelated file, nt/gnulib.mk.  I don't
>> know how this happened, because that is a file I'm not aware of ever
>> having touched, let alone changed (it's a generated file).  I don't know
>> if this is a problem but if it is, can someone who knows what to do
>> please take care of it, or tell me how to?
>
> Just delete that file, it should not be in the repository.  "git rm"
> etc. (Let me know if you need more detailed instructions.)

Do you mean a new commit using "git rm" on my local branch and then
pushing it to master at Savannah, or will that file there be removed
otherwise?

>> And also tell me how to avoid a possible reoccurrence of in future
>> commits?  Thanks and sorry for the nuisance.
>
> The only reliable way I know of is to say "git show" after committing
> and before pushing, and review the diffs carefully making sure the
> commit only includes what I meant it to.

Yes, I must have been careless and overlooked that file (though I don't
know how it got added to my local branch in the first place).  Sorry
again, and thanks for the advice.

Steve Berman

Re: Commit mistake?

[Stefan Monnier]

> And also tell me how to avoid a possible reoccurrence of in future
> commits?

Hard to help if you don't give us at least a hint of what commands/UI
you used to do the commit.  Did you use "git commit" on the command
line, or Magit, or VC, or something yet different?


        Stefan

Re: Commit mistake?

[Eli Zaretskii]

> From: Stephen Berman <stephen.berman@gmx.net>
> Cc: emacs-devel@gnu.org
> Date: Sun, 25 Nov 2018 17:47:46 +0100
> 
> > Just delete that file, it should not be in the repository.  "git rm"
> > etc. (Let me know if you need more detailed instructions.)
> 
> Do you mean a new commit using "git rm" on my local branch and then
> pushing it to master at Savannah

Yes.

Re: Commit mistake?

[Stephen Berman]

On Sun, 25 Nov 2018 11:49:22 -0500 Stefan Monnier <monnier@iro.umontreal.ca> wrote:

>> And also tell me how to avoid a possible reoccurrence of in future
>> commits?
>
> Hard to help if you don't give us at least a hint of what commands/UI
> you used to do the commit.  Did you use "git commit" on the command
> line, or Magit, or VC, or something yet different?

I used VC.  The file was listed in *vc-dir*, but it has been for ages
and was never a problem before.  But this time after I committed the
change the status of that file also changed to "up-to-date", which
suprised me but, unfortunately, didn't stop me from pressing `P' to push
the commit (since, again, that file had "always" been there but never
got into a previous commit).  I know I should have stopped to think, and
hopefully I will in future, but I wonder how that file became part of
the commit in the first place (again, I never knowingly touched it).

Steve Berman

Re: Commit mistake?

[Stefan Monnier]

> I used VC.  The file was listed in *vc-dir*, but it has been for ages
> and was never a problem before.

Hmm... IIUC it was there because it's a file we used to generate but we
don't generate any more, so it's not ignored by .gitignore any more
(i.e. you should just `rm` it).

I recommend you don't ignore files marked as "unknown" in *vc-dir*:
they're a sign that there's a problem somewhere and it should be fixed
either by removing the file, or renaming it, or by changing .gitignore.

> But this time after I committed the change the status of that file
> also changed to "up-to-date", which suprised me but, unfortunately,

Do you remember exactly how you caused the commit?  I guess you used `v`
in *vc-dir*, but did you first select the files you wanted to commit, or
did you rely on the position of point to specify the file(s) (maybe
with point placed on a directory)?


        Stefan

Re: Commit mistake?

[Stephen Berman]

On Sun, 25 Nov 2018 13:16:35 -0500 Stefan Monnier <monnier@IRO.UMontreal.CA> wrote:

>> I used VC.  The file was listed in *vc-dir*, but it has been for ages
>> and was never a problem before.
>
> Hmm... IIUC it was there because it's a file we used to generate but we
> don't generate any more, so it's not ignored by .gitignore any more
> (i.e. you should just `rm` it).

Yes, I've since done that.

> I recommend you don't ignore files marked as "unknown" in *vc-dir*:
> they're a sign that there's a problem somewhere and it should be fixed
> either by removing the file, or renaming it, or by changing .gitignore.

Thanks, I'll bear that in mind.

>> But this time after I committed the change the status of that file
>> also changed to "up-to-date", which suprised me but, unfortunately,
>
> Do you remember exactly how you caused the commit?  I guess you used `v`
> in *vc-dir*, but did you first select the files you wanted to commit, or
> did you rely on the position of point to specify the file(s) (maybe
> with point placed on a directory)?

I'm pretty sure I marked only the file I wanted to commit and then typed
`v' -- that's what I habitually do -- but I can't categorically rule out
that I may have just typed `v' without marking.  I also don't recall
seeing the unwanted file in the list of files shown when editing the
commit message, but here too, I may have overlooked it.

Steve

Re: Commit mistake?

[Stefan Monnier]

> I'm pretty sure I marked only the file I wanted to commit and then typed
> `v' -- that's what I habitually do -- but I can't categorically rule out
> that I may have just typed `v' without marking.

It sounds like you "do it right", and it was just an accident.
I wouldn't worry much more about it,


        Stefan