InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Also delete extraneous whitespace

BUG=685326

Change-Id: If7f68346fd27edf9a5dca315cfcfbca0decc2da6
Reviewed-on: https://chromium-review.googlesource.com/433158
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@chromium.org>
This commit is contained in:
Jeff Carpenter
2017-01-25 12:51:26 -08:00
committed by Commit Bot
parent 8adfedcf43
commit 056bef208a
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
git-crrev-parse
View File

@@ -6,19 +6,19 @@
# This git extension converts a chromium commit number to its git commit hash.
# 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 refs/heads/master@{#311769}
#
#
# It also works for branches (assuming you have branches in your local
# checkout):
#
#
# $ git crrev-parse refs/branch-heads/2278@{#2}
#
#
# If you don't specify a branch, refs/heads/master is assumed:
#
#
# $ git crrev-parse @{#311769}
# $ git crrev-parse 311769
@@ -41,11 +41,10 @@ while [ -n "$1" ]; do
remote_ref="${remote_ref/refs\/branch-heads/refs\/remotes\/branch-heads}"
num="${commit_pos#*@\{\#}"
num="${num%\}}"
if [ -z "$ref" -o -z "$num" ]; then
git rev-parse "$1"
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"
fi