From: Eric Sunshine <sunshine@sunshineco.com>
To: Christian Couder <chriscool@tuxfamily.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Git List <git@vger.kernel.org>, Jeff King <peff@peff.net>,
Jakub Narebski <jnareb@gmail.com>
Subject: Re: [PATCH v2 4/4] contrib: add convert-grafts-to-replace-refs.sh
Date: Sun, 1 Jun 2014 15:42:25 -0400 [thread overview]
Message-ID: <CAPig+cTjJHRDQFckLqRCW0xHkMFLVbuYGrLCWHXZQoFsYY5WwA@mail.gmail.com> (raw)
In-Reply-To: <20140601151038.15428.20661.chriscool@tuxfamily.org>
On Sun, Jun 1, 2014 at 11:10 AM, Christian Couder
<chriscool@tuxfamily.org> wrote:
> This patch adds into contrib/ an example script to convert
> grafts from an existing grafts file into replace refs using
> the new --graft option of "git replace".
>
> While at it let's mention this new script in the
> "git replace" documentation for the --graft option.
>
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---
> diff --git a/contrib/convert-grafts-to-replace-refs.sh b/contrib/convert-grafts-to-replace-refs.sh
> new file mode 100755
> index 0000000..7718a53
> --- /dev/null
> +++ b/contrib/convert-grafts-to-replace-refs.sh
> @@ -0,0 +1,29 @@
> +#!/bin/sh
> +
> +# You should execute this script in the repository where you
> +# want to convert grafts to replace refs.
> +
> +die () {
> + echo >&2 "$@"
> + exit 1
> +}
> +
> +GRAFTS_FILE="${GIT_DIR:-.git}/info/grafts"
> +
> +test -f "$GRAFTS_FILE" || die "Could not find graft file: '$GRAFTS_FILE'"
> +
> +grep '^[^# ]' "$GRAFTS_FILE" | while read definition
> +do
> + test -n "$definition" && {
> + echo "Converting: $definition"
> + git replace --graft $definition ||
> + die "Convertion failed for: $definition"
s/Convertion/Conversion/ [1]
[1]: http://git.661346.n2.nabble.com/Re-PATCH-contrib-add-convert-grafts-to-replace-refs-sh-tp7611822.html
> + }
> +done
> +
> +mv "$GRAFTS_FILE" "$GRAFTS_FILE.bak" ||
> + die "Could not mv '$GRAFTS_FILE' to '$GRAFTS_FILE.bak'"
"Could not rename..." might be a bit more friendly to non-Unixy folk.
> +echo "Success!"
> +echo "All the grafts in '$GRAFTS_FILE' have been converted to replace refs!"
> +echo "The grafts file '$GRAFTS_FILE' has been renamed: '$GRAFTS_FILE.bak'"
> --
> 2.0.0.rc0.40.gd30ccc4
next prev parent reply other threads:[~2014-06-01 19:42 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-01 15:10 [PATCH v2 0/4] Add --graft option to git replace Christian Couder
2014-06-01 15:10 ` [PATCH v2 1/4] replace: add --graft option Christian Couder
2014-06-01 15:10 ` [PATCH v2 2/4] replace: add test for --graft Christian Couder
2014-06-01 15:10 ` [PATCH v2 3/4] Documentation: replace: add --graft option Christian Couder
2014-06-01 15:10 ` [PATCH v2 4/4] contrib: add convert-grafts-to-replace-refs.sh Christian Couder
2014-06-01 19:42 ` Eric Sunshine [this message]
2014-06-02 19:16 ` Christian Couder
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=CAPig+cTjJHRDQFckLqRCW0xHkMFLVbuYGrLCWHXZQoFsYY5WwA@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=peff@peff.net \
/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).