From: Jörg Sommer Date: Mon, 14 Apr 2008 00:21:04 GMT Subject: [PATCH v2 08/13] Unify the lenght of $SHORT* and the commits in the TODO list Message-ID: <1208132469-26471-8-git-send-email-joerg@alea.gnuu.de> In-Reply-To: <1208132469-26471-7-git-send-email-joerg@alea.gnuu.de> This makes it easier to test for equality of a commit in the TODO list and one of SHORTUPSTREAM, SHORTHEAD or SHORTONTO. Signed-off-by: Jörg Sommer --- 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 fd41ca0..d0a7e5c 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -588,9 +588,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.5