From: David Barr <davidbarr@google.com>
To: Dominique Quatravaux <domq@google.com>
Cc: git@vger.kernel.org, Thomas Rast <trast@inf.ethz.ch>,
Johannes Sixt <j.sixt@viscovery.net>
Subject: Re: [PATCHv2 1/2] rebase -i: optimize the creation of the todo file
Date: Fri, 9 Mar 2012 16:00:19 +1100 [thread overview]
Message-ID: <CAFfmPPMt_o1Rg-Pvuh_KpARrASwfYSq74UN3ayp=LVzLJ0oj=A@mail.gmail.com> (raw)
In-Reply-To: <1331214777-9455-1-git-send-email-domq@google.com>
On Fri, Mar 9, 2012 at 12:52 AM, Dominique Quatravaux <domq@google.com> wrote:
> Instead of obtaining short SHA1's from "git rev-list" and hitting the repository
> once more with "git rev-parse" for the full-size SHA1's, obtain both short and
> long SHA1's from "git log" at once.
> ---
> git-rebase--interactive.sh | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index 5812222..e408e94 100644
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -774,17 +774,16 @@ else
> revisions=$onto...$orig_head
> shortrevisions=$shorthead
> fi
> -git rev-list $merges_option --pretty=oneline --abbrev-commit \
> +git rev-list $merges_option --format="%m%H %h %s" --abbrev-commit \
> --abbrev=7 --reverse --left-right --topo-order \
> $revisions | \
> sed -n "s/^>//p" |
> -while read -r shortsha1 rest
> +while read -r sha1 shortsha1 rest
> do
> if test t != "$preserve_merges"
> then
> printf '%s\n' "pick $shortsha1 $rest" >> "$todo"
> else
> - sha1=$(git rev-parse $shortsha1)
> if test -z "$rebase_root"
> then
> preserve=t
> --
> 1.7.7.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Ack. Yay, less forking.
I do notice however that the output being fed to sed expands like so:
commit >634a5f265ad729b91266de65272e2b5a35d05b1c
>634a5f265ad729b91266de65272e2b5a35d05b1c 634a5f2 INSTALL: warn [...]
commit >828ea97de486c1693d6e4f2c7347acb50235a85d
>828ea97de486c1693d6e4f2c7347acb50235a85d 828ea97 Git 1.7.9
Maybe the format spec and sed command could use a little tuning.
--
David Barr
next prev parent reply other threads:[~2012-03-09 5:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-08 13:52 [PATCHv2 1/2] rebase -i: optimize the creation of the todo file Dominique Quatravaux
2012-03-08 13:52 ` [PATCHv2 2/2] rebase -i: new option --name-rev Dominique Quatravaux
2012-03-09 5:00 ` David Barr [this message]
2012-03-09 9:18 ` [PATCHv2 1/2] rebase -i: optimize the creation of the todo file Dominique Quatravaux
2012-03-09 9:21 ` Dominique Quatravaux
2012-03-09 9:47 ` Junio C Hamano
2012-03-09 9:52 ` Dominique Quatravaux
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='CAFfmPPMt_o1Rg-Pvuh_KpARrASwfYSq74UN3ayp=LVzLJ0oj=A@mail.gmail.com' \
--to=davidbarr@google.com \
--cc=domq@google.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=trast@inf.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.
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).