summaryrefslogtreecommitdiffstats
path: root/llvm/utils/git-svn
diff options
context:
space:
mode:
authorJordan Rupprecht <rupprecht@google.com>2019-08-13 17:19:53 +0000
committerJordan Rupprecht <rupprecht@google.com>2019-08-13 17:19:53 +0000
commit39bce250d25b766f9e19f7858caf1704bef9abcc (patch)
tree01ab2693ffc75dff9f65912cb9d789a81f0b4ccb /llvm/utils/git-svn
parent97c35c9f57cff622bbb52dba7e05b1e1ce29961a (diff)
downloadbcm5719-llvm-39bce250d25b766f9e19f7858caf1704bef9abcc.tar.gz
bcm5719-llvm-39bce250d25b766f9e19f7858caf1704bef9abcc.zip
[util] Allow callsigns when running git llvm revert
llvm-svn: 368726
Diffstat (limited to 'llvm/utils/git-svn')
-rwxr-xr-xllvm/utils/git-svn/git-llvm6
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/utils/git-svn/git-llvm b/llvm/utils/git-svn/git-llvm
index 43ec4fb06ef..0d1220e845c 100755
--- a/llvm/utils/git-svn/git-llvm
+++ b/llvm/utils/git-svn/git-llvm
@@ -556,9 +556,9 @@ def cmd_revert(args):
if len(open_files) > 0:
die("Found open files. Please stash and then revert.\n" + open_files)
- # If the revision looks like rNNNNNN, use that. Otherwise, look for it in
- # the git commit.
- svn_match = re.match('^r(\d{5,7})$', args.revision)
+ # If the revision looks like rNNNNNN (or with a callsign, e.g. rLLDNNNNNN),
+ # use that. Otherwise, look for it in the git commit.
+ svn_match = re.match('^r[A-Z]*(\d{5,7})$', args.revision)
if svn_match:
# If the revision looks like rNNNNNN, use that as the svn revision, and
# grep through git commits to find which one corresponds to that svn
OpenPOWER on IntegriCloud