[PATCH] D59161: [git-llvm] Only use --force-interactive when supported

[Shoaib Meenai via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL355782: [git-llvm] Only use --force-interactive when supported (authored by smeenai, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D59161?vs=189952&id=189998#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D59161/new/

https://reviews.llvm.org/D59161

Files:
  llvm/trunk/utils/git-svn/git-llvm


Index: llvm/trunk/utils/git-svn/git-llvm
===================================================================
--- llvm/trunk/utils/git-svn/git-llvm
+++ llvm/trunk/utils/git-svn/git-llvm
@@ -345,7 +345,10 @@
     # Now we're ready to commit.
     commit_msg = git('show', '--pretty=%B', '--quiet', rev)
     if not dry_run:
-        log(svn(svn_repo, 'commit', '-m', commit_msg, '--force-interactive'))
+        commit_args = ['commit', '-m', commit_msg]
+        if '--force-interactive' in svn(svn_repo, 'commit', '--help'):
+            commit_args.append('--force-interactive')
+        log(svn(svn_repo, *commit_args))
         log('Committed %s to svn.' % rev)
     else:
         log("Would have committed %s to svn, if this weren't a dry run." % rev)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D59161.189998.patch
Type: text/x-patch
Size: 757 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190310/f74bab17/attachment.bin>