From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?q?J=C3=B6rg=20Sommer?= Subject: [PATCH/RFC 06/10] Unify the lenght of $SHORT* and the commits in the TODO list Date: Thu, 10 Apr 2008 01:58:37 +0200 Message-ID: <1207785521-27742-7-git-send-email-joerg@alea.gnuu.de> References: <7vabkoufzq.fsf@gitster.siamese.dyndns.org> <1207785521-27742-1-git-send-email-joerg@alea.gnuu.de> <1207785521-27742-2-git-send-email-joerg@alea.gnuu.de> <1207785521-27742-3-git-send-email-joerg@alea.gnuu.de> <1207785521-27742-4-git-send-email-joerg@alea.gnuu.de> <1207785521-27742-5-git-send-email-joerg@alea.gnuu.de> <1207785521-27742-6-git-send-email-joerg@alea.gnuu.de> Cc: gitster@pobox.com, Johannes.Schindelin@gmx.de, =?utf-8?q?J=C3=B6rg=20Sommer?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Apr 10 02:04:22 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1JjkH2-0004V7-S9 for gcvg-git-2@gmane.org; Thu, 10 Apr 2008 02:04:17 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754840AbYDJADX (ORCPT ); Wed, 9 Apr 2008 20:03:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751389AbYDJADX (ORCPT ); Wed, 9 Apr 2008 20:03:23 -0400 Received: from banki.eumelnet.de ([83.246.114.63]:3467 "EHLO uucp.gnuu.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754797AbYDJADH (ORCPT ); Wed, 9 Apr 2008 20:03:07 -0400 Received: by uucp.gnuu.de (Postfix, from userid 10) id 893DF488065; Thu, 10 Apr 2008 02:03:03 +0200 (CEST) Received: from ibook.localnet ([192.168.0.5] helo=alea.gnuu.de) by alea.gnuu.de with esmtp (Exim 4.63) (envelope-from ) id 1JjkBg-0004mG-M6; Thu, 10 Apr 2008 01:58:44 +0200 Received: from joerg by alea.gnuu.de with local (Exim 4.69) (envelope-from ) id 1JjkBe-0007EX-Bx; Thu, 10 Apr 2008 01:58:42 +0200 X-Mailer: git-send-email 1.5.4.5 In-Reply-To: <1207785521-27742-6-git-send-email-joerg@alea.gnuu.de> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: --- git-rebase--interactive.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 1698c3e..060b40f 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -600,9 +600,9 @@ do MERGES_OPTION=--no-merges fi - SHORTUPSTREAM=$(git rev-parse --short $UPSTREAM) - SHORTHEAD=$(git rev-parse --short $HEAD) - SHORTONTO=$(git rev-parse --short $ONTO) + SHORTUPSTREAM=$(git rev-parse --short=7 $UPSTREAM) + SHORTHEAD=$(git rev-parse --short=7 $HEAD) + SHORTONTO=$(git rev-parse --short=7 $ONTO) git rev-list $MERGES_OPTION --pretty=oneline --abbrev-commit \ --abbrev=7 --reverse --left-right --cherry-pick \ $UPSTREAM...$HEAD | \ -- 1.5.4.5