From: Junio C Hamano <gitster@pobox.com>
To: Yuki Kokubun <orga.chem.job@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v3] filter-branch: fix errors caused by refs that point at non-committish
Date: Sun, 25 Mar 2018 09:25:02 -0700 [thread overview]
Message-ID: <xmqqr2o8f7hd.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <1521920467-6091-1-git-send-email-orga.chem.job@gmail.com> (Yuki Kokubun's message of "Sat, 24 Mar 2018 19:41:07 +0000")
Yuki Kokubun <orga.chem.job@gmail.com> writes:
> "git filter-branch -- --all" print error messages when refs that point at
> objects that are not committish.
Grammo (third-person singular 'prints' misspelt without 's'; the
"when" clause has a complex subject but no verb).
Perhaps this will salvage what you meant:
"git filter-branch -- --all" prints error messages when
processing refs that point at objects that are not
committish.
> Such refs can be created by "git replace" with
> trees or blobs. And also "git tag" with trees or blobs can create such refs.
>
> Filter these problematic refs out early, before they are seen by the logic to
> see which refs have been modified and which have been left intact (which is
> where the unwanted error messages come from), and warn that these refs are left
> unwritten while doing so.
> ---
Please sign-off your patch (cf. Documentation/SubmittingPatches).
Otherwise this round looks good.
Thanks.
> git-filter-branch.sh | 14 ++++++++++++--
> t/t7003-filter-branch.sh | 14 ++++++++++++++
> 2 files changed, 26 insertions(+), 2 deletions(-)
>
> diff --git a/git-filter-branch.sh b/git-filter-branch.sh
> index 1b7e4b2..41efecb 100755
> --- a/git-filter-branch.sh
> +++ b/git-filter-branch.sh
> @@ -251,8 +251,18 @@ done < "$tempdir"/backup-refs
>
> # The refs should be updated if their heads were rewritten
> git rev-parse --no-flags --revs-only --symbolic-full-name \
> - --default HEAD "$@" > "$tempdir"/raw-heads || exit
> -sed -e '/^^/d' "$tempdir"/raw-heads >"$tempdir"/heads
> + --default HEAD "$@" > "$tempdir"/raw-refs || exit
> +while read ref
> +do
> + case "$ref" in ^?*) continue ;; esac
> +
> + if git rev-parse --verify "$ref"^0 >/dev/null 2>&1
> + then
> + echo "$ref"
> + else
> + warn "WARNING: not rewriting '$ref' (not a committish)"
> + fi
> +done >"$tempdir"/heads <"$tempdir"/raw-refs
>
> test -s "$tempdir"/heads ||
> die "You must specify a ref to rewrite."
> diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
> index 7cb6079..04f79f3 100755
> --- a/t/t7003-filter-branch.sh
> +++ b/t/t7003-filter-branch.sh
> @@ -470,4 +470,18 @@ test_expect_success 'tree-filter deals with object name vs pathname ambiguity' '
> git show HEAD:$ambiguous
> '
>
> +test_expect_success 'rewrite repository including refs that point at non-commit object' '
> + test_when_finished "git reset --hard original" &&
> + tree=$(git rev-parse HEAD^{tree}) &&
> + test_when_finished "git replace -d $tree" &&
> + echo A >new &&
> + git add new &&
> + new_tree=$(git write-tree) &&
> + git replace $tree $new_tree &&
> + git tag -a -m "tag to a tree" treetag $new_tree &&
> + git reset --hard HEAD &&
> + git filter-branch -f -- --all >filter-output 2>&1 &&
> + ! fgrep fatal filter-output
> +'
> +
> test_done
next prev parent reply other threads:[~2018-03-25 16:25 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-21 10:35 [PATCH] filter-branch: consider refs/replace can refer to an object other than commit Yuki Kokubun
2018-03-21 15:31 ` [PATCH] filter-branch: consider refs can refer to an object other than commit or tag Yuki Kokubun
2018-03-21 17:21 ` Junio C Hamano
2018-03-21 20:00 ` Yuki Kokubun
2018-03-21 20:00 ` Junio C Hamano
2018-03-22 14:26 ` Yuki Kokubun
2018-03-22 17:01 ` Junio C Hamano
2018-03-23 2:15 ` Yuki Kokubun
2018-03-23 5:09 ` [PATCH v2] filter-branch: fix errors caused by refs that cannot be used with ^0 Yuki Kokubun
2018-03-23 20:20 ` Junio C Hamano
2018-03-24 19:41 ` [PATCH v3] filter-branch: fix errors caused by refs that point at non-committish Yuki Kokubun
2018-03-25 16:25 ` Junio C Hamano [this message]
2018-03-25 16:39 ` Yuki Kokubun
2018-03-25 20:24 ` Junio C Hamano
2018-03-25 16:54 ` [PATCH v4] " Yuki Kokubun
2018-03-25 16:45 ` Yuki Kokubun
2018-04-08 23:10 ` Junio C Hamano
2018-03-25 17:01 ` [PATCH v5] " Yuki Kokubun
2018-03-25 17:13 ` [PATCH v4] " Junio C Hamano
2018-03-24 19:29 ` [PATCH] filter-branch: consider refs can refer to an object other than commit or tag Yuki Kokubun
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqr2o8f7hd.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=orga.chem.job@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).