From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Feb 2017 20:52:24 +0000 (-0800)
Subject: Merge branch 'ew/complete-svn-authorship-options'
X-Git-Tag: v2.12.0-rc1~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f7490fdf855916a4014faeb4fa328239c7eb945b?hp=5c40e9ce8170991b9d6580fa1550e0a204e0f4ab

Merge branch 'ew/complete-svn-authorship-options'

Correct command line completion (in contrib/) on "git svn"

* ew/complete-svn-authorship-options:
completion: fix git svn authorship switches
---

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index f0ce11296c..6c6e1c774d 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2587,14 +2587,14 @@ _git_svn ()
 			--no-metadata --use-svm-props --use-svnsync-props
 			--log-window-size= --no-checkout --quiet
 			--repack-flags --use-log-author --localtime
+			--add-author-from
 			--ignore-paths= --include-paths= $remote_opts
 			"
 		local init_opts="
 			--template= --shared= --trunk= --tags=
 			--branches= --stdlayout --minimize-url
 			--no-metadata --use-svm-props --use-svnsync-props
-			--rewrite-root= --prefix= --use-log-author
-			--add-author-from $remote_opts
+			--rewrite-root= --prefix= $remote_opts
 			"
 		local cmt_opts="
 			--edit --rmdir --find-copies-harder --copy-similarity=