From: Dominique Quatravaux <domq@google.com>
To: gitster@pobox.com, git@vger.kernel.org
Cc: Dominique Quatravaux <domq@google.com>
Subject: [PATCH 1/2] rebase -i: optimize the creation of the todo file
Date: Thu, 8 Mar 2012 11:42:37 +0100 [thread overview]
Message-ID: <1331203358-28277-1-git-send-email-domq@google.com> (raw)
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 long SHA1's from
"git rev-list" and truncate them with "cut".
---
git-rebase--interactive.sh | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 5812222..8dcb8b0 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -774,17 +774,17 @@ else
revisions=$onto...$orig_head
shortrevisions=$shorthead
fi
-git rev-list $merges_option --pretty=oneline --abbrev-commit \
- --abbrev=7 --reverse --left-right --topo-order \
+git rev-list $merges_option --pretty=oneline --no-abbrev-commit \
+ --reverse --left-right --topo-order \
$revisions | \
sed -n "s/^>//p" |
-while read -r shortsha1 rest
+while read -r sha1 rest
do
+ shortsha1=$(echo $sha1 | cut -c1-7)
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
next reply other threads:[~2012-03-08 10:43 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-08 10:42 Dominique Quatravaux [this message]
2012-03-08 10:42 ` [PATCH 2/2] rebase -i: new option --name-rev Dominique Quatravaux
2012-03-08 10:56 ` Thomas Rast
2012-03-08 11:57 ` Dominique Quatravaux
2012-03-08 18:58 ` Junio C Hamano
2012-03-09 7:58 ` Dominique Quatravaux
2012-03-08 19:08 ` Junio C Hamano
2012-03-08 22:13 ` Junio C Hamano
2012-03-09 7:22 ` Johannes Sixt
2012-03-09 9:04 ` Dominique Quatravaux
2012-03-09 9:45 ` Junio C Hamano
2012-03-08 10:48 ` [PATCH 1/2] rebase -i: optimize the creation of the todo file Thomas Rast
2012-03-08 11:48 ` Dominique Quatravaux
2012-03-08 11:55 ` Thomas Rast
2012-03-08 11:20 ` Johannes Sixt
2012-03-08 11:36 ` Dominique Quatravaux
2012-03-08 11:41 ` Dominique Quatravaux
2012-03-08 11:51 ` Johannes Sixt
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=1331203358-28277-1-git-send-email-domq@google.com \
--to=domq@google.com \
--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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.