From: Pierre Habouzit <madcoder@debian.org>
To: Petr Baudis <pasky@suse.cz>
Cc: git@vger.kernel.org, Sverre Rabbelier <srabbelier@gmail.com>
Subject: Re: [PATCH] git-filter-branch: Add an example on how to remove empty commits
Date: Thu, 30 Oct 2008 14:26:23 +0100 [thread overview]
Message-ID: <20081030132623.GC24098@artemis.corp> (raw)
In-Reply-To: <1225326833-15210-1-git-send-email-pasky@suse.cz>
[-- Attachment #1: Type: text/plain, Size: 1675 bytes --]
On Thu, Oct 30, 2008 at 12:33:53AM +0000, Petr Baudis wrote:
> From: Sverre Rabbelier <srabbelier@gmail.com>
>
> Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
> Signed-off-by: Petr Baudis <pasky@suse.cz>
> ---
> Documentation/git-filter-branch.txt | 15 +++++++++++++++
> 1 files changed, 15 insertions(+), 0 deletions(-)
>
> diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
> index fed6de6..2565244 100644
> --- a/Documentation/git-filter-branch.txt
> +++ b/Documentation/git-filter-branch.txt
> @@ -246,6 +246,21 @@ git filter-branch --commit-filter '
> fi' HEAD
> ------------------------------------------------------------------------------
>
> +To remove commits that are empty (do not introduce any change):
> +
> +------------------------------------------------------------------------------
> +git rev-list HEAD | while read c; do [ -n "$(git diff-tree --root $c)" ] || echo $c; done > revs
> +
> +git filter-branch --commit-filter '
> + if grep -q "$GIT_COMMIT" '"$(pwd)/"revs';
> + then
> + skip_commit "$@";
> + else
> + git commit-tree "$@";
> + fi' HEAD
> +
> +------------------------------------------------------------------------------
Why not add an option to filter-branch that removes a commit if it's
empty ? It's quite useful, it helps the user concentrating on just
keeping what matches *his* criteriums, and not caring about the minor
details of cleansing the result.
--
·O· Pierre Habouzit
··O madcoder@debian.org
OOO http://www.madism.org
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-10-30 13:27 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-30 0:33 [PATCH] git-filter-branch: Add an example on how to remove empty commits Petr Baudis
2008-10-30 0:39 ` Sam Vilain
2008-10-30 0:56 ` Johannes Schindelin
2008-10-30 13:26 ` Pierre Habouzit [this message]
2008-10-30 15:06 ` Deskin Miller
2008-10-30 15:10 ` Pierre Habouzit
2008-10-30 16:18 ` filter-branch enhancements Pierre Habouzit
2008-10-30 16:18 ` [PATCH] make git-filter-branch use parse-options Pierre Habouzit
2008-10-30 16:18 ` [Proof of concept PATCH] implement --prune-empty switch for filter-branch Pierre Habouzit
2008-10-31 8:22 ` [PATCH] make git-filter-branch use parse-options Pierre Habouzit
2008-10-31 9:26 ` [PATCH] filter-branch: add git_commit_non_empty_tree and --prune-empty Pierre Habouzit
2008-10-31 22:36 ` Johannes Schindelin
2008-10-31 22:42 ` Pierre Habouzit
2008-11-03 4:58 ` Junio C Hamano
2008-11-03 9:27 ` Pierre Habouzit
2008-11-03 15:18 ` Pierre Habouzit
2009-01-09 19:29 ` Jay Soffian
2009-01-11 11:18 ` Pierre Habouzit
2009-01-11 13:35 ` Johannes Schindelin
2009-01-11 14:27 ` Pierre Habouzit
2009-01-11 14:40 ` Sverre Rabbelier
2009-01-11 14:55 ` Pierre Habouzit
2009-01-11 15:08 ` Sverre Rabbelier
2009-01-11 20:52 ` Junio C Hamano
2009-01-11 20:55 ` Johannes Schindelin
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=20081030132623.GC24098@artemis.corp \
--to=madcoder@debian.org \
--cc=git@vger.kernel.org \
--cc=pasky@suse.cz \
--cc=srabbelier@gmail.com \
/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).