From: Johannes Sixt <j.sixt@viscovery.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: [PATCH] filter-branch: do not consider diverging submodules a 'dirty worktree'
Date: Wed, 04 Feb 2009 18:25:13 +0100 [thread overview]
Message-ID: <4989CF79.2070209@viscovery.net> (raw)
In-Reply-To: <7vvdrqunog.fsf@gitster.siamese.dyndns.org>
Junio C Hamano schrieb:
> If so, why do we even check dirtiness of anything at all?
>
> This is not a "wouldn't this better?" proposal patch, but a "why isn't the
> patch like this?" question patch.
>
> git-filter-branch.sh | 6 ------
> 1 files changed, 0 insertions(+), 6 deletions(-)
>
> diff --git i/git-filter-branch.sh w/git-filter-branch.sh
> index eb62f71..dda32e0 100755
> --- i/git-filter-branch.sh
> +++ w/git-filter-branch.sh
> @@ -107,12 +107,6 @@ USAGE="[--env-filter <command>] [--tree-filter <command>] \
> OPTIONS_SPEC=
> . git-sh-setup
>
> -if [ "$(is_bare_repository)" = false ]; then
> - git diff-files --quiet &&
> - git diff-index --cached --quiet HEAD -- ||
> - die "Cannot rewrite branch(es) with a dirty working directory."
> -fi
> -
> tempdir=.git-rewrite
> filter_env=
> filter_tree=
Because if the repository is non-bare, then filter-branch updates the
work-tree at the end of the run; we don't want to overwrite uncommitted
work in this case.
This behavior is a relic from cg-admin-rewritehist, I think. I've never
found it useful.
-- Hannes
next prev parent reply other threads:[~2009-02-04 17:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1233758410u.git.johannes.schindelin@gmx.de>
2009-02-04 14:40 ` [PATCH] filter-branch: do not consider diverging submodules a 'dirty worktree' Johannes Schindelin
2009-02-04 17:17 ` Junio C Hamano
2009-02-04 17:24 ` Johannes Schindelin
2009-02-04 17:25 ` Johannes Sixt [this message]
2009-02-04 18:00 ` Junio C Hamano
2009-02-04 18:15 ` Johannes Schindelin
2009-02-04 18:57 ` Junio C Hamano
2009-02-05 17:39 ` Johannes Schindelin
2009-02-05 6:49 ` Johannes Sixt
[not found] <cover.1233855372u.git.johannes.schindelin@gmx.de>
2009-02-05 17:37 ` Johannes Schindelin
2009-02-05 17:43 ` Junio C Hamano
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=4989CF79.2070209@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.