]> git.ipfire.org Git - thirdparty/git.git/commitdiff
completion: fix git svn authorship switches
authorEric Wong <e@80x24.org>
Sun, 5 Feb 2017 02:18:57 +0000 (02:18 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Feb 2017 18:40:39 +0000 (10:40 -0800)
--add-author-from and --use-log-author are for "git svn dcommit",
not "git svn (init|clone)"

Signed-off-by: Eric Wong <e@80x24.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/completion/git-completion.bash

index 21016bf8dfe87572fb53a05488ba05bb3c08ed97..e88b0d777fce4793e74804010622aa9083164813 100644 (file)
@@ -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=