git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: John Fultz <jfultz@wolfram.com>
To: git@vger.kernel.org
Subject: git filter-branch not removing commits when it should in 2.7.0
Date: Tue, 19 Jan 2016 14:48:40 -0600	[thread overview]
Message-ID: <AF975DD2-988F-47A8-BFC3-3BBC27419305@wolfram.com> (raw)

This seems to be a 2.7.0 regression in filter-branch.  The bug is reproducible on Mac/Windows (haven't tried Linux) in the 2.7.0 production releases.

Make an empty repo and put an empty commit in the history.  E.g.,

echo > foo && git add . && git commit -m "commit 1" && git commit --allow-empty -m "commit 2"

Now try to use filter-branch to remove the empty commit.  Both of the following methods leave master unchanged, but both worked in 2.6.4:

git filter-branch --prune-empty
git filter-branch --commit-filter 'git_commit_non_empty_tree "$@"'

Let me know if you need any more information.  Thanks.

Sincerely,

John Fultz
jfultz@wolfram.com
User Interface Group
Wolfram Research, Inc.

             reply	other threads:[~2016-01-19 20:54 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-19 20:48 John Fultz [this message]
2016-01-19 21:14 ` git filter-branch not removing commits when it should in 2.7.0 Junio C Hamano
2016-01-19 21:35   ` Junio C Hamano
2016-01-19 21:37     ` Jeff King
2016-01-19 21:46       ` Junio C Hamano
2016-01-19 21:51         ` [PATCH] filter-branch: resolve $commit^{tree} in no-index case Jeff King
2016-01-19 21:59           ` Jeff King
2016-01-19 22:07             ` Jeff King
2016-01-19 22:23               ` Junio C Hamano
2016-01-19 22:28             ` Jeff King
2016-01-19 22:48               ` Jeff King
2016-01-20  1:22               ` Jonathan Nieder
2016-01-20  1:34                 ` Jeff King
2016-01-20  1:51                   ` Junio C Hamano
2016-01-20  2:00                     ` Jeff King
2016-01-20  2:43                       ` Junio C Hamano
2016-01-20  3:23                         ` Junio C Hamano
2016-01-20  4:14                           ` Jeff King
2016-01-20  0:47           ` Jonathan Nieder

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=AF975DD2-988F-47A8-BFC3-3BBC27419305@wolfram.com \
    --to=jfultz@wolfram.com \
    --cc=git@vger.kernel.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. 
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).