[PATCH 1/2] bash: fix misspelled 'git svn' option

[PATCH 1/2] bash: fix misspelled 'git svn' option

[SZEDER Gábor]

'--user-log-author' -> '--use-log-author'

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
 contrib/completion/git-completion.bash |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index ad45717..18cabe2 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1614,7 +1614,7 @@ _git_svn ()
 			--follow-parent --authors-file= --repack=
 			--no-metadata --use-svm-props --use-svnsync-props
 			--log-window-size= --no-checkout --quiet
-			--repack-flags --user-log-author --localtime $remote_opts
+			--repack-flags --use-log-author --localtime $remote_opts
 			"
 		local init_opts="
 			--template= --shared= --trunk= --tags=
-- 
1.6.2.rc0.111.g246ed

[PATCH 2/2] bash: update 'git svn' options

[SZEDER Gábor]

'git svn' got some new subcommands and otions in the last couple of
months.  This patch adds completion support for them.

In particular:

  * 'fetch', 'clone', etc.: '--ignore-paths='
  * 'init' and 'clone': '--prefix=', '--use-log-author',
                        '--add-author-from'
  * 'dcommit': '--commit-url', '--revision'
  * 'log': '--color'
  * 'rebase': '--dry-run'
  * 'branch', 'tag', 'blame', 'migrate' subcommands and their options

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
 contrib/completion/git-completion.bash |   31 +++++++++++++++++++++++++------
 1 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 18cabe2..625e580 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1603,7 +1603,8 @@ _git_svn ()
 	local subcommands="
 		init fetch clone rebase dcommit log find-rev
 		set-tree commit-diff info create-ignore propget
-		proplist show-ignore show-externals
+		proplist show-ignore show-externals branch tag blame
+		migrate
 		"
 	local subcommand="$(__git_find_subcommand "$subcommands")"
 	if [ -z "$subcommand" ]; then
@@ -1614,13 +1615,15 @@ _git_svn ()
 			--follow-parent --authors-file= --repack=
 			--no-metadata --use-svm-props --use-svnsync-props
 			--log-window-size= --no-checkout --quiet
-			--repack-flags --use-log-author --localtime $remote_opts
+			--repack-flags --use-log-author --localtime
+			--ignore-paths= $remote_opts
 			"
 		local init_opts="
 			--template= --shared= --trunk= --tags=
 			--branches= --stdlayout --minimize-url
 			--no-metadata --use-svm-props --use-svnsync-props
-			--rewrite-root= $remote_opts
+			--rewrite-root= --prefix= --use-log-author
+			--add-author-from $remote_opts
 			"
 		local cmt_opts="
 			--edit --rmdir --find-copies-harder --copy-similarity=
@@ -1640,7 +1643,8 @@ _git_svn ()
 		dcommit,--*)
 			__gitcomp "
 				--merge --strategy= --verbose --dry-run
-				--fetch-all --no-rebase $cmt_opts $fc_opts
+				--fetch-all --no-rebase --commit-url
+				--revision $cmt_opts $fc_opts
 				"
 			;;
 		set-tree,--*)
@@ -1654,13 +1658,13 @@ _git_svn ()
 			__gitcomp "
 				--limit= --revision= --verbose --incremental
 				--oneline --show-commit --non-recursive
-				--authors-file=
+				--authors-file= --color
 				"
 			;;
 		rebase,--*)
 			__gitcomp "
 				--merge --verbose --strategy= --local
-				--fetch-all $fc_opts
+				--fetch-all --dry-run $fc_opts
 				"
 			;;
 		commit-diff,--*)
@@ -1669,6 +1673,21 @@ _git_svn ()
 		info,--*)
 			__gitcomp "--url"
 			;;
+		branch,--*)
+			__gitcomp "--dry-run --message --tag"
+			;;
+		tag,--*)
+			__gitcomp "--dry-run --message"
+			;;
+		blame,--*)
+			__gitcomp "--git-format"
+			;;
+		migrate,--*)
+			__gitcomp "
+				--config-dir= --ignore-paths= --minimize
+				--no-auth-cache --username=
+				"
+			;;
 		*)
 			COMPREPLY=()
 			;;
-- 
1.6.2.rc0.111.g246ed

Re: [PATCH 1/2] bash: fix misspelled 'git svn' option

[Junio C Hamano]

Looks obviously correct; queued.

Thanks.

Re: [PATCH 2/2] bash: update 'git svn' options

[Shawn O. Pearce]

SZEDER Gábor <szeder@ira.uka.de> wrote:
> 'git svn' got some new subcommands and otions in the last couple of
> months.  This patch adds completion support for them.
> 
> In particular:
> 
>   * 'fetch', 'clone', etc.: '--ignore-paths='
>   * 'init' and 'clone': '--prefix=', '--use-log-author',
>                         '--add-author-from'
>   * 'dcommit': '--commit-url', '--revision'
>   * 'log': '--color'
>   * 'rebase': '--dry-run'
>   * 'branch', 'tag', 'blame', 'migrate' subcommands and their options
> 
> Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>

Acked-by: Shawn O. Pearce <spearce@spearce.org>

>  contrib/completion/git-completion.bash |   31 +++++++++++++++++++++++++------
>  1 files changed, 25 insertions(+), 6 deletions(-)

-- 
Shawn.

Re: [PATCH 2/2] bash: update 'git svn' options

[Junio C Hamano]

"Shawn O. Pearce" <spearce@spearce.org> writes:

> SZEDER Gábor <szeder@ira.uka.de> wrote:
>> 'git svn' got some new subcommands and otions in the last couple of
>> months.  This patch adds completion support for them.
>> 
>> In particular:
>> 
>>   * 'fetch', 'clone', etc.: '--ignore-paths='
>>   * 'init' and 'clone': '--prefix=', '--use-log-author',
>>                         '--add-author-from'
>>   * 'dcommit': '--commit-url', '--revision'
>>   * 'log': '--color'
>>   * 'rebase': '--dry-run'
>>   * 'branch', 'tag', 'blame', 'migrate' subcommands and their options
>> 
>> Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
>
> Acked-by: Shawn O. Pearce <spearce@spearce.org>

Thanks, both.