* Absentee log entry and Git question [not found] <87edab30yq.fsf.ref@yahoo.com> @ 2024-05-09 7:21 ` Po Lu 2024-05-09 7:48 ` Gerd Möllmann 0 siblings, 1 reply; 10+ messages in thread From: Po Lu @ 2024-05-09 7:21 UTC (permalink / raw) To: emacs-devel There is no log message for: commit fa24bbb631fce7c5110dc322264224842cbb28d8 Author: Alan Third <alan@idiocy.org> Date: Sun Jul 23 12:00:30 2023 +0100 Simplify the EmacsLayer double buffering code (bug#63187) I suggest: * src/nsfns.m (ns_set_inhibit_double_buffering): New function. (ns_frame_parm_handlers): Register new handler for `inhibit-double-buffering' (Fx_create_frame) [NS_IMPL_COCOA]: Apply default value of Qinhibit_double_buffering on Mac OS 10.14 and later. Yet after running `git filter-branch' to amend the log message, the server refuses to accept the updated state of the repository, which, I suppose, is down to my privileges being insufficient to run administrator commands. Would one of the project administrators care to do the honors? I dimly recall asking a similar question in the past, so please excuse me if I'm repeating myself. Thanks. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Absentee log entry and Git question 2024-05-09 7:21 ` Absentee log entry and Git question Po Lu @ 2024-05-09 7:48 ` Gerd Möllmann 2024-05-09 8:08 ` Po Lu 2024-05-09 8:08 ` tomas 0 siblings, 2 replies; 10+ messages in thread From: Gerd Möllmann @ 2024-05-09 7:48 UTC (permalink / raw) To: Po Lu; +Cc: emacs-devel Po Lu <luangruo@yahoo.com> writes: > There is no log message for: > > commit fa24bbb631fce7c5110dc322264224842cbb28d8 > Author: Alan Third <alan@idiocy.org> > Date: Sun Jul 23 12:00:30 2023 +0100 > > Simplify the EmacsLayer double buffering code (bug#63187) > > I suggest: > > * src/nsfns.m (ns_set_inhibit_double_buffering): New function. > (ns_frame_parm_handlers): Register new handler for > `inhibit-double-buffering' > (Fx_create_frame) [NS_IMPL_COCOA]: Apply default value of > Qinhibit_double_buffering on Mac OS 10.14 and later. > > Yet after running `git filter-branch' to amend the log message, the > server refuses to accept the updated state of the repository, which, I > suppose, is down to my privileges being insufficient to run > administrator commands. Would one of the project administrators care to > do the honors? > > I dimly recall asking a similar question in the past, so please excuse > me if I'm repeating myself. Thanks. Quote from git filter-branch's man page WARNING! The rewritten history will have different object names for all the objects and will not converge with the original branch. You will not be able to easily push and distribute the rewritten branch on top of the original branch. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Absentee log entry and Git question 2024-05-09 7:48 ` Gerd Möllmann @ 2024-05-09 8:08 ` Po Lu 2024-05-09 8:11 ` Andreas Schwab 2024-05-09 8:08 ` tomas 1 sibling, 1 reply; 10+ messages in thread From: Po Lu @ 2024-05-09 8:08 UTC (permalink / raw) To: Gerd Möllmann; +Cc: emacs-devel Gerd Möllmann <gerd.moellmann@gmail.com> writes: > Quote from git filter-branch's man page > > WARNING! The rewritten history will have different object names for all > the objects and will not converge with the original branch. You will not > be able to easily push and distribute the rewritten branch on top of the > original branch. I see. Is it possible to modify a revision's properties without incurring such divergence? ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Absentee log entry and Git question 2024-05-09 8:08 ` Po Lu @ 2024-05-09 8:11 ` Andreas Schwab 2024-05-09 8:22 ` Po Lu 0 siblings, 1 reply; 10+ messages in thread From: Andreas Schwab @ 2024-05-09 8:11 UTC (permalink / raw) To: Po Lu; +Cc: Gerd Möllmann, emacs-devel On Mai 09 2024, Po Lu wrote: > I see. Is it possible to modify a revision's properties without > incurring such divergence? No. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different." ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Absentee log entry and Git question 2024-05-09 8:11 ` Andreas Schwab @ 2024-05-09 8:22 ` Po Lu 2024-05-09 9:43 ` Eli Zaretskii 2024-05-09 10:41 ` Sean Allred 0 siblings, 2 replies; 10+ messages in thread From: Po Lu @ 2024-05-09 8:22 UTC (permalink / raw) To: Andreas Schwab; +Cc: Gerd Möllmann, emacs-devel Andreas Schwab <schwab@linux-m68k.org> writes: > No. Alright, so how should this error be corrected in the VC log and generated ChangeLog files? It would be dreadfully simple to forget when that time eventually comes. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Absentee log entry and Git question 2024-05-09 8:22 ` Po Lu @ 2024-05-09 9:43 ` Eli Zaretskii 2024-05-09 9:48 ` Arsen Arsenović 2024-05-09 10:41 ` Sean Allred 1 sibling, 1 reply; 10+ messages in thread From: Eli Zaretskii @ 2024-05-09 9:43 UTC (permalink / raw) To: Po Lu; +Cc: schwab, gerd.moellmann, emacs-devel > From: Po Lu <luangruo@yahoo.com> > Cc: Gerd Möllmann <gerd.moellmann@gmail.com>, > emacs-devel@gnu.org > Date: Thu, 09 May 2024 16:22:32 +0800 > > Andreas Schwab <schwab@linux-m68k.org> writes: > > > No. > > Alright, so how should this error be corrected in the VC log and > generated ChangeLog files? It would be dreadfully simple to forget when > that time eventually comes. The VC log is carved in stone with Git, so it cannot be corrected. We _can_ correct that in the generated ChangeLog file, though. To this end, one needs to generate ChangeLog.4, then edit it, and then commit the fixed version. This can be done now, or it can be deferred until the first pretest tarball is made for the next version. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Absentee log entry and Git question 2024-05-09 9:43 ` Eli Zaretskii @ 2024-05-09 9:48 ` Arsen Arsenović 2024-05-09 9:52 ` Eli Zaretskii 0 siblings, 1 reply; 10+ messages in thread From: Arsen Arsenović @ 2024-05-09 9:48 UTC (permalink / raw) To: Eli Zaretskii; +Cc: Po Lu, schwab, gerd.moellmann, emacs-devel [-- Attachment #1: Type: text/plain, Size: 1118 bytes --] Hi. Eli Zaretskii <eliz@gnu.org> writes: >> From: Po Lu <luangruo@yahoo.com> >> Cc: Gerd Möllmann <gerd.moellmann@gmail.com>, >> emacs-devel@gnu.org >> Date: Thu, 09 May 2024 16:22:32 +0800 >> >> Andreas Schwab <schwab@linux-m68k.org> writes: >> >> > No. >> >> Alright, so how should this error be corrected in the VC log and >> generated ChangeLog files? It would be dreadfully simple to forget when >> that time eventually comes. > > The VC log is carved in stone with Git, so it cannot be corrected. > > We _can_ correct that in the generated ChangeLog file, though. To > this end, one needs to generate ChangeLog.4, then edit it, and then > commit the fixed version. This can be done now, or it can be deferred > until the first pretest tarball is made for the next version. Could an empty commit with just the missing ChangeLog hunk work? It can be created using: git commit --allow-empty BTW, it might make sense to reuse/reimplement some of the git infrastructure GCC uses to prevent pushes without matching ChangeLogs. Have a lovely day. -- Arsen Arsenović [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 251 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Absentee log entry and Git question 2024-05-09 9:48 ` Arsen Arsenović @ 2024-05-09 9:52 ` Eli Zaretskii 0 siblings, 0 replies; 10+ messages in thread From: Eli Zaretskii @ 2024-05-09 9:52 UTC (permalink / raw) To: Arsen Arsenović; +Cc: luangruo, schwab, gerd.moellmann, emacs-devel > From: Arsen Arsenović <arsen@aarsen.me> > Cc: Po Lu <luangruo@yahoo.com>, schwab@linux-m68k.org, > gerd.moellmann@gmail.com, emacs-devel@gnu.org > Date: Thu, 09 May 2024 11:48:00 +0200 > > > The VC log is carved in stone with Git, so it cannot be corrected. > > > > We _can_ correct that in the generated ChangeLog file, though. To > > this end, one needs to generate ChangeLog.4, then edit it, and then > > commit the fixed version. This can be done now, or it can be deferred > > until the first pretest tarball is made for the next version. > > Could an empty commit with just the missing ChangeLog hunk work? It can > be created using: > > git commit --allow-empty It won't help, so no. > BTW, it might make sense to reuse/reimplement some of the git > infrastructure GCC uses to prevent pushes without matching ChangeLogs. We already have such hooks, but that commit was more than 6 months ago. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Absentee log entry and Git question 2024-05-09 8:22 ` Po Lu 2024-05-09 9:43 ` Eli Zaretskii @ 2024-05-09 10:41 ` Sean Allred 1 sibling, 0 replies; 10+ messages in thread From: Sean Allred @ 2024-05-09 10:41 UTC (permalink / raw) To: Po Lu; +Cc: Andreas Schwab, Gerd Möllmann, emacs-devel Po Lu <luangruo@yahoo.com> writes: > Andreas Schwab <schwab@linux-m68k.org> writes: >> No. > Alright, so how should this error be corrected in the VC log and > generated ChangeLog files? I tend to think this would be an over-engineered solution unless this happens often, but if you're sufficiently-motivated, you could look at using notes refs for this purpose.[1] git-notes are intended (for the most part) to add information to existing history, so a system could certainly be constructed during changelog gen that would read from a note as well if it exists (or perhaps in an overriding fashion). If you do go down this route, please CC me; I'd be interested to see where you end up. [1]: https://git-scm.com/docs/git-notes -- Sean Allred ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: Absentee log entry and Git question 2024-05-09 7:48 ` Gerd Möllmann 2024-05-09 8:08 ` Po Lu @ 2024-05-09 8:08 ` tomas 1 sibling, 0 replies; 10+ messages in thread From: tomas @ 2024-05-09 8:08 UTC (permalink / raw) To: Gerd Möllmann; +Cc: Po Lu, emacs-devel [-- Attachment #1: Type: text/plain, Size: 1658 bytes --] On Thu, May 09, 2024 at 09:48:53AM +0200, Gerd Möllmann wrote: > Po Lu <luangruo@yahoo.com> writes: [...] > > Yet after running `git filter-branch' to amend the log message, the > > server refuses to accept the updated state of the repository, which, I > > suppose, is down to my privileges being insufficient to run > > administrator commands. Would one of the project administrators care to > > do the honors? > > > > I dimly recall asking a similar question in the past, so please excuse > > me if I'm repeating myself. Thanks. > > Quote from git filter-branch's man page > > WARNING! The rewritten history will have different object names for all > the objects and will not converge with the original branch. You will not > be able to easily push and distribute the rewritten branch on top of the > original branch. To restate in more detail -- you would have to at least add the -f (--force) flag to your push. That said, the remote repo might be set up to refuse this operation (a sensible thing to do for a public repo, see below). BEWARE: this will break everyone else's "git fetch" aka "git pull" if they have a clone of the repo, because the histories don't match. They would (more or less) have to throw away their local clones and re-clone. With whatever gymnastics it takes to rescue their local changes. So whether you actually want to do this will depend on how many clones of that (part of) the repo you think are out there and whether you think you can talk to the people having one of those. Changing history is hard. Especially if more than one has looked at it :-) Cheers -- t [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 195 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-05-09 10:41 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- [not found] <87edab30yq.fsf.ref@yahoo.com> 2024-05-09 7:21 ` Absentee log entry and Git question Po Lu 2024-05-09 7:48 ` Gerd Möllmann 2024-05-09 8:08 ` Po Lu 2024-05-09 8:11 ` Andreas Schwab 2024-05-09 8:22 ` Po Lu 2024-05-09 9:43 ` Eli Zaretskii 2024-05-09 9:48 ` Arsen Arsenović 2024-05-09 9:52 ` Eli Zaretskii 2024-05-09 10:41 ` Sean Allred 2024-05-09 8:08 ` tomas
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).