From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Newsgroups: gmane.emacs.devel Subject: Re: Absentee log entry and Git question Date: Thu, 9 May 2024 10:08:49 +0200 Message-ID: References: <87edab30yq.fsf.ref@yahoo.com> <87edab30yq.fsf@yahoo.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="W4Dkd2K3DVeYOUcI" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="22587"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Po Lu , emacs-devel@gnu.org To: Gerd =?utf-8?B?TcO2bGxtYW5u?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu May 09 10:09:51 2024 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1s4yqc-0005jw-KT for ged-emacs-devel@m.gmane-mx.org; Thu, 09 May 2024 10:09:50 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s4ypo-0006ue-1y; Thu, 09 May 2024 04:09:00 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s4ypk-0006u6-CN for emacs-devel@gnu.org; Thu, 09 May 2024 04:08:57 -0400 Original-Received: from mail.tuxteam.de ([5.199.139.25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s4ypi-0007eW-Fa for emacs-devel@gnu.org; Thu, 09 May 2024 04:08:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tuxteam.de; s=mail; h=From:In-Reply-To:Content-Type:MIME-Version:References:Message-ID: Subject:Cc:To:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=OLO51VwlTfjXB+tD3tAPTz4VqXNXlKzrvvHRL2SK3B0=; b=fdbx+8sbMU6I56LhfBGtl5FsAq OGZ0hyQzLecmyMScM4feYV9yu+zdqnO4rQVkSfHaFb4CmKthtFyokPbwIJKrRCD3mnGlakW2mUVKn dkNjgFPJeChYunmWNY3xrFeLFARR3KRSq2kv0UG2zFzuz6k+iHG2C4lN+cp1v8ntn9R/buc7dPQTp JzFxm6ocICp9qLa6OeZIQMdKBkfYtxzOj97hzgC6eEzvrU5h+S68Z/ptpiIO8TPtKAcA+JuS8K46a qtusTDn1PCA+DVJmf5CdfaqVcskG8U2DZ5RA4C9c1hiWRoFUel8AWMP6ErJLPXGr+iQPfQ4K1enw/ wJI+GLdQ==; Original-Received: from tomas by mail.tuxteam.de with local (Exim 4.94.2) (envelope-from ) id 1s4ypd-0006MG-1p; Thu, 09 May 2024 10:08:49 +0200 Content-Disposition: inline In-Reply-To: Received-SPF: pass client-ip=5.199.139.25; envelope-from=tomas@tuxteam.de; helo=mail.tuxteam.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:319051 Archived-At: --W4Dkd2K3DVeYOUcI Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, May 09, 2024 at 09:48:53AM +0200, Gerd M=C3=B6llmann wrote: > Po Lu 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. >=20 > Quote from git filter-branch's man page >=20 > 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 --=20 t --W4Dkd2K3DVeYOUcI Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQRp53liolZD6iXhAoIFyCz1etHaRgUCZjyEkAAKCRAFyCz1etHa RnidAJ9vr1nzHvK6NvG5YELpa8Sk71sO7QCcDEQnutxu3grnLyu/gxus0U4osRk= =jp5L -----END PGP SIGNATURE----- --W4Dkd2K3DVeYOUcI--