Commit 056bef20 authored by Jeff Carpenter's avatar Jeff Carpenter Committed by Commit Bot

Fix git-crrev-parse returning reverted commits instead of original commits

Also delete extraneous whitespace

BUG=685326

Change-Id: If7f68346fd27edf9a5dca315cfcfbca0decc2da6
Reviewed-on: https://chromium-review.googlesource.com/433158Reviewed-by: 's avatarDirk Pranke <dpranke@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@chromium.org>
parent 8adfedcf
...@@ -6,19 +6,19 @@ ...@@ -6,19 +6,19 @@
# This git extension converts a chromium commit number to its git commit hash. # This git extension converts a chromium commit number to its git commit hash.
# It accepts the following input formats: # It accepts the following input formats:
# #
# $ git crrev-parse Cr-Commit-Position: refs/heads/master@{#311769} # $ git crrev-parse Cr-Commit-Position: refs/heads/master@{#311769}
# $ git crrev-parse ' Cr-Commit-Position: refs/heads/master@{#311769}' # $ git crrev-parse ' Cr-Commit-Position: refs/heads/master@{#311769}'
# $ git crrev-parse 'Cr-Commit-Position: refs/heads/master@{#311769}' # $ git crrev-parse 'Cr-Commit-Position: refs/heads/master@{#311769}'
# $ git crrev-parse refs/heads/master@{#311769} # $ git crrev-parse refs/heads/master@{#311769}
# #
# It also works for branches (assuming you have branches in your local # It also works for branches (assuming you have branches in your local
# checkout): # checkout):
# #
# $ git crrev-parse refs/branch-heads/2278@{#2} # $ git crrev-parse refs/branch-heads/2278@{#2}
# #
# If you don't specify a branch, refs/heads/master is assumed: # If you don't specify a branch, refs/heads/master is assumed:
# #
# $ git crrev-parse @{#311769} # $ git crrev-parse @{#311769}
# $ git crrev-parse 311769 # $ git crrev-parse 311769
...@@ -41,11 +41,10 @@ while [ -n "$1" ]; do ...@@ -41,11 +41,10 @@ while [ -n "$1" ]; do
remote_ref="${remote_ref/refs\/branch-heads/refs\/remotes\/branch-heads}" remote_ref="${remote_ref/refs\/branch-heads/refs\/remotes\/branch-heads}"
num="${commit_pos#*@\{\#}" num="${commit_pos#*@\{\#}"
num="${num%\}}" num="${num%\}}"
if [ -z "$ref" -o -z "$num" ]; then if [ -z "$ref" -o -z "$num" ]; then
git rev-parse "$1" git rev-parse "$1"
else else
grep_str="Cr-Commit-Position: $ref@{#$num}" grep_str="^Cr-Commit-Position: $ref@{#$num}"
git rev-list -n 1 --grep="$grep_str" "$remote_ref" git rev-list -n 1 --grep="$grep_str" "$remote_ref"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment