From: "Bert Wesarg" <bert.wesarg@googlemail.com>
To: "Thomas Rast" <trast@student.ethz.ch>
Cc: git@vger.kernel.org, "Petr Baudis" <pasky@suse.cz>
Subject: Re: [TopGit TOY PATCH] tg-graft: forge tip--base--<deps...> history for a subcommand
Date: Wed, 13 Aug 2008 09:10:40 +0200 [thread overview]
Message-ID: <36ca99e90808130010w226a8947y1e1c59e5f5d57989@mail.gmail.com> (raw)
In-Reply-To: <1218575416-16711-1-git-send-email-trast@student.ethz.ch>
On Tue, Aug 12, 2008 at 23:10, Thomas Rast <trast@student.ethz.ch> wrote:
> Adds a command 'tg graft <command>' that evaluates <command> with a
> special GIT_GRAFT_FILE: the parent of each patch head is its patch
> base, and the parents of the patch base are the dependencies of the
> patch.
>
> Try, for example, 'tg graft "gitk --all"'.
>
> Signed-off-by: Thomas Rast <trast@student.ethz.ch>
> ---
>
> Mainly sending this so someone can turn it into a useful feature, and
> maybe build a few subcommands on top of it (that might call gitk or
> 'git log --graph', for example).
>
> The one big issue with the resulting history is that the commit
> messages at the tip aren't very interesting and may even be completely
> irrelevant (for a base merge). I don't see a good solution for that.
>
> Makefile | 2 +-
> tg-graft.sh | 47 +++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 48 insertions(+), 1 deletions(-)
> create mode 100755 tg-graft.sh
>
> diff --git a/Makefile b/Makefile
> index 6eade1e..57745c0 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -6,7 +6,7 @@ sharedir = $(PREFIX)/share/topgit
> hooksdir = $(cmddir)/hooks
>
>
> -commands_in = tg-create.sh tg-delete.sh tg-export.sh tg-info.sh tg-patch.sh tg-summary.sh tg-update.sh
> +commands_in = tg-create.sh tg-delete.sh tg-export.sh tg-info.sh tg-patch.sh tg-summary.sh tg-update.sh tg-graft.sh
Petr, maybe we should use a wildcard here, to prevent merge conflicts
while adding new commands.
I will send a patch.
> hooks_in = hooks/pre-commit.sh
>
> commands_out = $(patsubst %.sh,%,$(commands_in))
> diff --git a/tg-graft.sh b/tg-graft.sh
> new file mode 100755
> index 0000000..b6d0458
> --- /dev/null
> +++ b/tg-graft.sh
> @@ -0,0 +1,47 @@
> +#!/bin/sh
> +# TopGit - A different patch queue manager
> +# (c) Petr Baudis <pasky@suse.cz> 2008
> +# GPLv2
> +
> +if [ -z "$1" -o -n "$2" ]; then
> + echo "Usage: tg graft <command>" >&2
> + exit 1
> +fi
> +
> +mkdir -p "$git_dir"/info
This shouldn't be needed, the info dir is created by git init.
next prev parent reply other threads:[~2008-08-13 7:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-12 21:10 [TopGit TOY PATCH] tg-graft: forge tip--base--<deps...> history for a subcommand Thomas Rast
2008-08-13 7:10 ` Bert Wesarg [this message]
2008-08-13 7:11 ` [TopGit PATCH] Makefile: Use $(wildcard) for commands_in Bert Wesarg
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=36ca99e90808130010w226a8947y1e1c59e5f5d57989@mail.gmail.com \
--to=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=pasky@suse.cz \
--cc=trast@student.ethz.ch \
/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).