Re: Bug: pull --rebase with é in name

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 5, 2012, 17:23 UTC
Message-ID: <7v8vjf2c8o.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20120305132913.GA15004@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 8 quoted lines

> It would be nice if the --pretty format placeholders had a "shell-quote"
> modifier, and we could just do:
>
>   git show --format='GIT_AUTHOR_NAME=%(an:shell)'
>
> or something similar. for-each-ref knows about shell-quoting, but we
> can't use it here, because we are looking at arbitrary commits, not just
> ones pointed to by refs.

You guys seem to have been having a lot of fun overnight. Perhaps I should live on European time?

I think there were talks about cross pollinating and eventually unifying the placeholder languages of pretty and for-each-ref, and if we were to do so, I agree that --pretty definitely should learn to do --sq. But I do not think we want to teach everything :shell; following the style of %w(), something more generic that would apply to any payload would be preferred, perhaps giving an end result like this:

	git show -s --format='
		GIT_AUTHOR_NAME=%(sq-begin)%an%(sq-end)
                GIT_AUTHOR_EMAIL=%(sq-begin)%ae%(sq-end)
        '

which would be immediately `eval`-able.

Also I wonder if it is time for "git-am" to make more use of direct knowledge of the $rebasing and the original commit. Perhaps by teaching commit-tree to take the -c option from commit, we may not even have to worry about this.

In any case, my reading of the conclusion you guys have already reached in this thread is that the issue is not even a bug in Git, but is a broken build/installation of sed by a third-party. I am inclined to suggest any change to get_author_ident_from_commit helper backburnered before we teach --sq to --pretty machinery.

If the broken sed was the apple one that came with the platform, my conclusion might be different, but it seems to me that this is not something we would urgently have to worry about and patch our code up with an ugly band-aid workaround.