From: konglu@minatec.inpg.fr
To: Junio C Hamano <gitster@pobox.com>
Cc: Lucien Kong <Lucien.Kong@ensimag.imag.fr>,
git@vger.kernel.org,
Valentin Duperray <Valentin.Duperray@ensimag.imag.fr>,
Franck Jonas <Franck.Jonas@ensimag.imag.fr>,
Thomas Nguy <Thomas.Nguy@ensimag.imag.fr>,
Huynh Khoi Nguyen Nguyen
<Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Subject: Re: [PATCH] Warnings before rebasing -i published history
Date: Fri, 08 Jun 2012 09:32:57 +0200 [thread overview]
Message-ID: <20120608093257.Horde.eeddeHwdC4BP0aqpIrqTaVA@webmail.minatec.grenoble-inp.fr> (raw)
In-Reply-To: <7vwr3ieo0i.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> a écrit :
>> + do
>> + test -n "$sha1" || break
>> + if test -n "$(git branch -r --contains "$sha1")"
>> + then
>> + printf "%s\n" "$(sed -e "/"$sha1"/ s|$| [Published]|" "$1")" >"$1"
>> + fi
>> + done
>
> What's inside $() looks like it wants to say something like
>
> sed -e "/ $sha1 /s/$/ [Published]/" "$1"
>
> but it has a few fishy double-quotes that makes it unclear why $sha1
> wants to be outside the quotes.
>
> Why does it need 'printf "%s" $()' in the first place? Wouldn't
>
> sed ... >"$1"
> sufficient?
The fact is that the input of sed is "$1" itself. An redirecting the output
of sed to the same input doesn't seem to work.
> The logic is merely _guessing_ that the commit could have been
> published, no? The particular remote repository the test happens to
> find may not be for consumption by other people.
>
> I am afraid that doing this would send users a wrong message that is
> unnecessarily alarming, especially the marker says "Published" as if
> it were a confirmed fact.
True. It would be annoying for people that rewrite consciously published
history. From this point of view, a better idea would be to show the
remote branch name, as Matthieu suggested, so that the user could know
which branch is involved.
next prev parent reply other threads:[~2012-06-08 7:33 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-07 21:20 [PATCH] Warnings before rebasing -i published history Lucien Kong
2012-06-07 22:04 ` Matthieu Moy
2012-06-08 14:03 ` konglu
2012-06-08 14:25 ` Matthieu Moy
2012-06-08 14:57 ` Junio C Hamano
2012-06-07 22:49 ` Junio C Hamano
2012-06-08 7:32 ` konglu [this message]
2012-06-08 8:52 ` Matthieu Moy
2012-06-08 9:18 ` Tomas Carnecky
2012-06-08 9:23 ` Matthieu Moy
2012-06-08 14:55 ` Junio C Hamano
2012-06-11 10:04 ` [PATCHv2] " Lucien Kong
2012-06-11 10:55 ` Matthieu Moy
2012-06-11 11:36 ` konglu
2012-06-11 11:39 ` Matthieu Moy
2012-06-11 11:46 ` branch --contains is unbearably slow [Re: [PATCHv2] Warnings before rebasing -i published history] Thomas Rast
2012-06-11 16:16 ` Junio C Hamano
2012-06-11 22:04 ` Thomas Rast
2012-06-11 22:08 ` Thomas Rast
2012-06-11 23:04 ` Junio C Hamano
2012-06-11 21:56 ` [PATCHv3 1/2] Warnings before rebasing -i published history Lucien Kong
2012-06-11 21:56 ` [PATCHv3 2/2] Warnings before amending " Lucien Kong
2012-06-12 7:34 ` Matthieu Moy
2012-06-12 15:22 ` Junio C Hamano
2012-06-12 7:45 ` [PATCHv3 1/2] Warnings before rebasing -i " Nguy Thomas
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=20120608093257.Horde.eeddeHwdC4BP0aqpIrqTaVA@webmail.minatec.grenoble-inp.fr \
--to=konglu@minatec.inpg.fr \
--cc=Franck.Jonas@ensimag.imag.fr \
--cc=Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr \
--cc=Lucien.Kong@ensimag.imag.fr \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=Thomas.Nguy@ensimag.imag.fr \
--cc=Valentin.Duperray@ensimag.imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).