[PATCH] completion: complete --move for git branch

Signed-off-by: Ville Skyttä <redacted>
---
 contrib/completion/git-completion.bash | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 3402475..6918cc8 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash

@@ -964,8 +964,8 @@ _git_branch ()
 	while [ $c -lt $cword ]; do
 		i="${words[c]}"
 		case "$i" in
-		-d|-m)	only_local_ref="y" ;;
-		-r)	has_r="y" ;;
+		-d|-m|--move)	only_local_ref="y" ;;
+		-r)		has_r="y" ;;
 		esac
 		((c++))
 	done

@@ -979,7 +979,7 @@ _git_branch ()
 			--color --no-color --verbose --abbrev= --no-abbrev
 			--track --no-track --contains --merged --no-merged
 			--set-upstream-to= --edit-description --list
-			--unset-upstream
+			--unset-upstream --move
 			"
 		;;
 	*)

-- 
2.5.5

Hi,

Ville Skyttä [off-list ref] writes:

         while [ $c -lt $cword ]; do
                 i="${words[c]}"
                 case "$i" in
-                -d|-m)        only_local_ref="y" ;;
-                -r)        has_r="y" ;;
+                -d|-m|--move)        only_local_ref="y" ;;

"While you're at it" you might want to do the same thing for
`--delete`.

+                -r)                has_r="y" ;;

You are introducing an additional tab here that you probably didn't
want.

Thanks,
Rémi

On Mon, Jun 6, 2016 at 5:16 PM, Remi Galan Alfonso
[off-list ref] wrote:

Hi,

Ville Skyttä [off-list ref] writes:

quoted

         while [ $c -lt $cword ]; do
                 i="${words[c]}"
                 case "$i" in
-                -d|-m)        only_local_ref="y" ;;
-                -r)        has_r="y" ;;
+                -d|-m|--move)        only_local_ref="y" ;;

"While you're at it" you might want to do the same thing for
`--delete`.

I'm afraid the "while I'm at it" would never end if I start looking
deeper into missing things there, so I'd prefer this self contained
one I keep running into myself applied first.

quoted

+                -r)                has_r="y" ;;

You are introducing an additional tab here that you probably didn't
want.

It was intentionally added it to keep "only_local_ref" and "has_r"
tab-aligned the way they already were.

Ville Skyttä [off-list ref] writes:

On Mon, Jun 6, 2016 at 5:16 PM, Remi Galan Alfonso
[off-list ref] wrote:

quoted

Hi,

Ville Skyttä [off-list ref] writes:

quoted

         while [ $c -lt $cword ]; do
                 i="${words[c]}"
                 case "$i" in
-                -d|-m)        only_local_ref="y" ;;
-                -r)        has_r="y" ;;
+                -d|-m|--move)        only_local_ref="y" ;;

"While you're at it" you might want to do the same thing for
`--delete`.

I'm afraid the "while I'm at it" would never end if I start looking
deeper into missing things there, so I'd prefer this self contained
one I keep running into myself applied first.

I understand, though adding `--delete` here makes sense since there is
already the short-hand `-d` that is tested (like you added `--move`
since the short-hand `-m` is tested).
However adding it here means that we should also add it in completion
list below. Thinking about it, it might be better to have it in a
separate patch, so no further objections with this patch.

quoted

quoted

+                -r)                has_r="y" ;;

You are introducing an additional tab here that you probably didn't
want.

It was intentionally added it to keep "only_local_ref" and "has_r"
tab-aligned the way they already were.

Ah indeed, my bad, I didn't see it.

Thanks,
Rémi

Signed-off-by: Ville Skyttä <redacted>
---
 contrib/completion/git-completion.bash | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 6a187bc..76abbd1 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash

@@ -1008,8 +1008,8 @@ _git_branch ()
 	while [ $c -lt $cword ]; do
 		i="${words[c]}"
 		case "$i" in
-		-d|-m)	only_local_ref="y" ;;
-		-r)	has_r="y" ;;
+		-d|--delete|-m|--move)	only_local_ref="y" ;;
+		-r|--remotes)		has_r="y" ;;
 		esac
 		((c++))
 	done

@@ -1023,7 +1023,7 @@ _git_branch ()
 			--color --no-color --verbose --abbrev= --no-abbrev
 			--track --no-track --contains --merged --no-merged
 			--set-upstream-to= --edit-description --list
-			--unset-upstream
+			--unset-upstream --delete --move --remotes
 			"
 		;;
 	*)

-- 
2.5.5