From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Johannes Sixt <J.Sixt@eudaptics.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Add git-filter-branch
Date: Mon, 4 Jun 2007 17:11:59 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0706041711500.4046@racer.site> (raw)
In-Reply-To: <4663BCDA.F1BADDD8@eudaptics.com>
Hi,
On Mon, 4 Jun 2007, Johannes Sixt wrote:
> [...] any simple command like
>
> git filter-branch -k orgin/master origin/next new-next
>
> of your git.git clone will fail with the "assertion failed". (I haven't
> tried your script, yet, but cg-admin-rewritehist fails.)
As you mentioned yourself, you should say "-s origin/next".
cg-admin-rewritehist will only rewrite the current branch (since cogito
started out as one-branch-per-repo).
> I propose that you just get rid of the "seed" stance and don't fail if a
> commit cannot be mapped - just use it unchanged (don't forget to adjust
> the map() function, too).
It is as much for debug reasons as for consistency, so I'd rather keep it.
One more safety valve for catching bugs.
> Then you can get rid of -r and use -k to specify everything you want
> under "--not" in the rev-list.
Actually, -r is quite useful. It means "start rewriting with this commit",
and saying "--not <commit>^" is _not_ the same when <commit> is a merge.
Ciao,
Dscho
next prev parent reply other threads:[~2007-06-04 16:14 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-03 0:31 [PATCH] Add git-filter-branch Johannes Schindelin
2007-06-03 0:46 ` Jakub Narebski
2007-06-03 0:50 ` Johannes Schindelin
2007-06-03 10:28 ` Jakub Narebski
2007-06-03 18:36 ` Steven Grimm
2007-06-03 23:07 ` Johannes Schindelin
2007-06-05 10:18 ` Jonas Fonseca
2007-06-05 10:26 ` David Kastrup
2007-06-05 10:30 ` Junio C Hamano
2007-06-05 10:34 ` Jonas Fonseca
2007-06-05 13:55 ` Johannes Schindelin
2007-06-06 15:24 ` [PATCH] filter-branch: use $(($i+1)) instead of $((i+1)) Johannes Schindelin
2007-06-04 7:18 ` [PATCH] Add git-filter-branch Johannes Sixt
2007-06-04 7:59 ` Johannes Sixt
2007-06-04 16:11 ` Johannes Schindelin [this message]
2007-06-04 16:34 ` Johannes Sixt
2007-06-04 17:55 ` Johannes Schindelin
2007-06-05 7:01 ` Johannes Sixt
2007-06-05 15:58 ` Johannes Schindelin
2007-06-06 7:43 ` Johannes Sixt
2007-06-06 8:17 ` Junio C Hamano
2007-06-06 15:00 ` Johannes Schindelin
2007-06-06 15:22 ` Johannes Sixt
2007-06-06 17:59 ` Johannes Schindelin
2007-06-06 15:36 ` [PATCH] filter-branch: also don't fail in map() if a commit cannot be mapped Johannes Sixt
2007-06-06 17:50 ` Johannes Schindelin
2007-06-06 18:38 ` [PATCH v2] " Johannes Sixt
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=Pine.LNX.4.64.0706041711500.4046@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=J.Sixt@eudaptics.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).