diff options
author | George Burgess IV <gbiv@google.com> | 2020-01-10 14:07:45 -0800 |
---|---|---|
committer | George Burgess <gbiv@chromium.org> | 2020-01-11 19:14:02 +0000 |
commit | f414196425a688d7e37b49d47a7a5b4cbdee9148 (patch) | |
tree | 0462e4bdb1c8df4cd225f5b8a338f561984a22fa /crb | |
parent | 70e8bc6297046a2a55a9135a247cb72a0a251e6e (diff) | |
download | toolchain-utils-f414196425a688d7e37b49d47a7a5b4cbdee9148.tar.gz |
git_llvm_rev: handle merge commits more gracefully
llvm grew a relatively large merge commit recently, which broke this
script noticeably.
There's analysis of why this happened in the bug. tl;dr is that
`rev-parse ${sha}~${N}` and `rev-list --count` don't do the same thing
without extra flags.
BUG=chromium:1041016
TEST=Unit tests. A few random runs in my LLVM tree.
Change-Id: I393d1ada842b5f19846d961b403641bc958b191f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1995315
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Tested-by: George Burgess <gbiv@chromium.org>
Diffstat (limited to 'crb')
0 files changed, 0 insertions, 0 deletions