git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Phillip Wood <phillip.wood123@gmail.com>
To: Josef Wolf <jw@raven.inka.de>,
	git@vger.kernel.org,
	"brian m. carlson" <sandals@crustytoothpaste.net>,
	Elijah Newren <newren@gmail.com>
Subject: Re: renormalize histroy with smudge/clean-filter
Date: Thu, 6 Feb 2025 10:13:43 +0000	[thread overview]
Message-ID: <c88b7b54-d032-4d91-95f8-2f139ec45b78@gmail.com> (raw)
In-Reply-To: <20250205235931.GB30202@raven.inka.de>

Hi Josef

On 05/02/2025 23:59, Josef Wolf wrote:
> 
>> git rebase --root -x 'git add --renormalize . && git commit --amend --no-edit'
> 
> Unfortunately, this runs the command on every commit and gives a warning when
> a cmmit don't touch a filtered file:
> 
>    $ git rebase --root -x 'git add --renormalize . && git commit --amend --no-edit'
>    [ ... ]
>    No changes
>    You asked to amend the most recent commit, but doing so would make
>    it empty. You can repeat your command with --allow-empty, or you can
>    remove the commit entirely with "git reset HEAD^".
> 
> Is there a way to run the command only when rebase halts?

You could try using "git diff --cached --quiet" to avoid running "git 
commit" if there are no changes.

     git rebase --root -x 'git add --renormalize . && { git diff --quiet 
--cached || git commit --amend --no-edit; }'

Best Wishes

Phillip


  parent reply	other threads:[~2025-02-06 10:13 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-05 21:47 renormalize histroy with smudge/clean-filter Josef Wolf
2025-02-05 22:55 ` brian m. carlson
2025-02-05 23:59   ` Josef Wolf
2025-02-06  0:29     ` brian m. carlson
2025-02-06  8:07       ` Elijah Newren
2025-02-06 13:40         ` Josef Wolf
2025-02-06 20:04           ` Josef Wolf
2025-02-07  6:10             ` Chris Torek
2025-02-07 10:45               ` Josef Wolf
2025-02-07 11:06                 ` Torsten Bögershausen
2025-02-07 11:12                 ` Chris Torek
2025-02-07 11:17                   ` Chris Torek
2025-02-07 14:01                   ` Elijah Newren
2025-02-07 20:32                     ` Josef Wolf
2025-02-08  0:23                       ` Elijah Newren
2025-02-08 11:14                         ` Phillip Wood
2025-02-08 21:08                           ` Josef Wolf
2025-02-08 21:43                           ` Elijah Newren
2025-02-08 23:26                             ` Josef Wolf
2025-02-09  2:33                               ` D. Ben Knoble
2025-02-09  8:53                                 ` Josef Wolf
2025-02-09  7:21                               ` Elijah Newren
2025-02-09  8:57                                 ` Josef Wolf
2025-02-10 17:51                                   ` D. Ben Knoble
2025-02-08 20:57                         ` Josef Wolf
2025-02-08 21:56                           ` Elijah Newren
2025-02-09  9:25                           ` Josef Wolf
2025-02-09 11:14                             ` Torsten Bögershausen
2025-02-09 15:09                               ` Josef Wolf
2025-02-09 17:54                                 ` Josef Wolf
2025-02-09 18:01                                   ` Josef Wolf
2025-02-07 20:21                   ` Josef Wolf
2025-02-07 15:39                 ` Junio C Hamano
2025-02-06 10:13     ` Phillip Wood [this message]
2025-02-06  7:55   ` Elijah Newren
2025-02-06 19:00     ` Junio C Hamano
2025-02-11 23:57 ` renormalize histroy with smudge/clean-filter, again Josef Wolf
2025-02-12  6:12   ` Torsten Bögershausen
2025-02-12  8:18     ` Josef Wolf
2025-02-13 11:36   ` Collisions while cloning (was: Re: renormalize histroy with smudge/clean-filter, again) Josef Wolf
2025-02-13 16:40     ` Torsten Bögershausen
2025-02-14 20:03   ` renormalize histroy with smudge/clean-filter, again Josef Wolf
2025-02-14 20:21   ` brian m. carlson
2025-02-14 20:55     ` Josef Wolf

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c88b7b54-d032-4d91-95f8-2f139ec45b78@gmail.com \
    --to=phillip.wood123@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jw@raven.inka.de \
    --cc=newren@gmail.com \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=sandals@crustytoothpaste.net \
    /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.
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 NNTP newsgroup(s).