From: Thomas Rast <trast@student.ethz.ch>
To: git@vger.kernel.org
Cc: Jan Wielemaker <J.Wielemaker@uva.nl>
Subject: [RFH] filter-branch: ancestor detection weirdness
Date: Fri, 8 Aug 2008 01:54:02 +0200 [thread overview]
Message-ID: <1218153242-18837-1-git-send-email-trast@student.ethz.ch> (raw)
In-Reply-To: <200808080148.27384.trast@student.ethz.ch>
THIS WILL VERY LIKELY NOT WORK IN ALL CASES.
Use git rev-list -1 -- <subdir> to discover a random ancestor, instead
of more correct boundary detection. Oddly enough, this _increases_
success rate with Jan's repository and --all. May break randomly with
more complicated args.
---
Maybe someone understands what's going on and can fix the underlying
bug...
git-filter-branch.sh | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 182822a..52b2bdf 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -325,15 +325,9 @@ while read ref
do
sha1=$(git rev-parse "$ref"^0)
test -f "$workdir"/../map/$sha1 && continue
- # Assign the boundarie(s) in the set of rewritten commits
- # as the replacement commit(s).
- # (This would look a bit nicer if --not --stdin worked.)
- for p in $( (cd "$workdir"/../map; ls | sed "s/^/^/") |
- git rev-list $ref --boundary --stdin |
- sed -n "s/^-//p")
- do
- map $p >> "$workdir"/../map/$sha1
- done
+ # Assign the first commit not pruned as the replacement.
+ candidate=$(git rev-list $ref -1 -- "$filter_subdir")
+ test "$candidate" && map "$candidate" > "$workdir"/../map/$sha1
done < "$tempdir"/heads
# Finally update the refs
--
1.6.0.rc2.19.g3c9ba
next prev parent reply other threads:[~2008-08-07 23:54 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-06 13:39 git filter-branch --subdirectory-filter, still a mistery Jan Wielemaker
2008-08-07 7:13 ` Jan Wielemaker
2008-08-07 7:50 ` Thomas Rast
2008-08-07 10:14 ` Jan Wielemaker
2008-08-07 23:48 ` Thomas Rast
2008-08-07 23:50 ` [PATCH] filter-branch: be more helpful when an annotated tag changes Thomas Rast
2008-08-08 20:10 ` [TOY PATCH] filter-branch: add option --delete-unchanged Thomas Rast
2008-08-09 0:35 ` Johannes Schindelin
2008-08-11 10:43 ` Jan Wielemaker
2008-09-14 16:29 ` Felipe Contreras
2008-08-07 23:54 ` Thomas Rast [this message]
2008-08-08 11:42 ` [RFH] filter-branch: ancestor detection weirdness Johannes Schindelin
2008-08-08 14:14 ` Thomas Rast
2008-08-08 14:16 ` [PATCH] filter-branch: fix ancestor discovery for --subdirectory-filter Thomas Rast
2008-08-08 14:39 ` [RFH] filter-branch: ancestor detection weirdness Johannes Schindelin
2008-08-08 18:37 ` Thomas Rast
2008-08-08 18:39 ` [PATCH v2] filter-branch: fix ref rewriting with --subdirectory-filter Thomas Rast
2008-08-09 0:16 ` [RFH] filter-branch: ancestor detection weirdness Johannes Schindelin
2008-08-09 1:25 ` Junio C Hamano
2008-08-09 9:25 ` Thomas Rast
2008-08-09 9:35 ` Thomas Rast
2008-08-10 14:02 ` [PATCH] filter-branch: use --simplify-merges Thomas Rast
2008-08-12 1:54 ` Junio C Hamano
2008-08-12 2:13 ` Junio C Hamano
2008-08-12 5:47 ` Thomas Rast
2008-08-12 6:59 ` Junio C Hamano
2008-08-12 8:45 ` [PATCH 0/3] filter-branch --subdirectory-filter improvements Thomas Rast
2008-08-12 12:11 ` Jan Wielemaker
2008-08-12 8:45 ` [PATCH 1/3] filter-branch: Extend test to show rewriting bug Thomas Rast
2008-08-12 8:45 ` [PATCH 2/3] filter-branch: fix ref rewriting with --subdirectory-filter Thomas Rast
2008-08-12 8:45 ` [PATCH 3/3] filter-branch: use --simplify-merges Thomas Rast
2008-08-12 8:18 ` [RFH] filter-branch: ancestor detection weirdness Petr Baudis
2008-08-12 18:33 ` Junio C Hamano
2008-08-09 10:00 ` Thomas Rast
2008-08-12 21:33 ` Junio C Hamano
2008-08-12 22:15 ` Thomas Rast
2008-08-08 7:44 ` git filter-branch --subdirectory-filter, still a mistery Jan Wielemaker
2008-08-08 11:25 ` Jan Wielemaker
2008-08-07 14:04 ` [PATCH] Documentation: filter-branch: document how to filter all refs Thomas Rast
2008-08-07 14:16 ` [PATCH v2] " Thomas Rast
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=1218153242-18837-1-git-send-email-trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=J.Wielemaker@uva.nl \
--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).