From: Stephen Berman <stephen.berman@gmx.net>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: Commit mistake?
Date: Sun, 25 Nov 2018 17:47:46 +0100 [thread overview]
Message-ID: <87h8g5qf2l.fsf@gmx.net> (raw)
In-Reply-To: <83bm6djetx.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 25 Nov 2018 18:34:50 +0200")
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
next prev parent reply other threads:[~2018-11-25 16:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-25 13:22 Commit mistake? Stephen Berman
2018-11-25 16:34 ` Eli Zaretskii
2018-11-25 16:47 ` Stephen Berman [this message]
2018-11-25 17:06 ` Eli Zaretskii
2018-11-25 16:49 ` Stefan Monnier
2018-11-25 17:09 ` Stephen Berman
2018-11-25 18:16 ` Stefan Monnier
2018-11-25 18:42 ` Stephen Berman
2018-11-25 19:53 ` Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87h8g5qf2l.fsf@gmx.net \
--to=stephen.berman@gmx.net \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).