# [PATCH 1/3] completion: unite --reuse-message and --reedit-message handling 7 messages from 2011-10-06 to 2011-10-08. Participants: Teemu Matilainen, Junio C Hamano, SZEDER Gábor. Thread: https://gitlist.dev/t/28614 ## Teemu Matilainen, 2011-10-06 18:40 Subject: [PATCH 1/3] completion: unite --reuse-message and --reedit-message handling Message-ID: <1317926431-609-1-git-send-email-teemu.matilainen@iki.fi> URL: https://gitlist.dev/e/1317926431-609-1-git-send-email-teemu.matilainen%40iki.fi ``` Signed-off-by: Teemu Matilainen --- contrib/completion/git-completion.bash | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 8648a36..656297d 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1259,12 +1259,8 @@ _git_commit () " "" "${cur##--cleanup=}" return ;; - --reuse-message=*) - __gitcomp "$(__git_refs)" "" "${cur##--reuse-message=}" - return - ;; - --reedit-message=*) - __gitcomp "$(__git_refs)" "" "${cur##--reedit-message=}" + --reuse-message=*|--reedit-message=*) + __gitcomp "$(__git_refs)" "" "${cur#*=}" return ;; --untracked-files=*) -- 1.7.7.138.g7f41b6 ``` ## Teemu Matilainen, 2011-10-06 18:40 Subject: [PATCH 2/3] completion: commit --fixup and --squash Message-ID: <1317926431-609-2-git-send-email-teemu.matilainen@iki.fi> URL: https://gitlist.dev/e/1317926431-609-2-git-send-email-teemu.matilainen%40iki.fi In-Reply-To: <1317926431-609-1-git-send-email-teemu.matilainen@iki.fi> ``` Signed-off-by: Teemu Matilainen --- contrib/completion/git-completion.bash | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 656297d..847e6e9 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1259,7 +1259,8 @@ _git_commit () " "" "${cur##--cleanup=}" return ;; - --reuse-message=*|--reedit-message=*) + --reuse-message=*|--reedit-message=*|\ + --fixup=*|--squash=*) __gitcomp "$(__git_refs)" "" "${cur#*=}" return ;; @@ -1274,7 +1275,7 @@ _git_commit () --dry-run --reuse-message= --reedit-message= --reset-author --file= --message= --template= --cleanup= --untracked-files --untracked-files= - --verbose --quiet + --verbose --quiet --fixup= --squash= " return esac -- 1.7.7.138.g7f41b6 ``` ## Teemu Matilainen, 2011-10-06 18:40 Subject: [PATCH 3/3] completion: push --set-upstream Message-ID: <1317926431-609-3-git-send-email-teemu.matilainen@iki.fi> URL: https://gitlist.dev/e/1317926431-609-3-git-send-email-teemu.matilainen%40iki.fi In-Reply-To: <1317926431-609-1-git-send-email-teemu.matilainen@iki.fi> ``` Signed-off-by: Teemu Matilainen --- 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 847e6e9..344119b 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1730,7 +1730,7 @@ _git_push () --*) __gitcomp " --all --mirror --tags --dry-run --force --verbose - --receive-pack= --repo= + --receive-pack= --repo= --set-upstream " return ;; -- 1.7.7.138.g7f41b6 ``` ## Junio C Hamano, 2011-10-06 23:14 Subject: Re: [PATCH 1/3] completion: unite --reuse-message and --reedit-message handling Message-ID: <7vd3e9yap7.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vd3e9yap7.fsf%40alter.siamese.dyndns.org In-Reply-To: <1317926431-609-1-git-send-email-teemu.matilainen@iki.fi> ``` All three patches make sense to me. Thanks. ``` ## SZEDER Gábor, 2011-10-08 01:04 Subject: Re: [PATCH 1/3] completion: unite --reuse-message and --reedit-message handling Message-ID: <20111008010432.GA11561@goldbirke> URL: https://gitlist.dev/e/20111008010432.GA11561%40goldbirke In-Reply-To: <7vd3e9yap7.fsf@alter.siamese.dyndns.org> ``` Hi, On Thu, Oct 06, 2011 at 04:14:28PM -0700, Junio C Hamano wrote: > All three patches make sense to me. Thanks. This is a good cleanup/deduplication; there are a few places where similar cleanup can be done. Since this conflicted with one of my more intrusive WIP branches, I figured it's better to clean up those first, too. Best, Gábor ``` ## SZEDER Gábor, 2011-10-08 01:06 Subject: [PATCH 1/2] completion: unite --reuse-message and --reedit-message for 'notes' Message-ID: <20111008010634.GB11561@goldbirke> URL: https://gitlist.dev/e/20111008010634.GB11561%40goldbirke In-Reply-To: <20111008010432.GA11561@goldbirke> ``` Signed-off-by: SZEDER Gábor --- contrib/completion/git-completion.bash | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 847e6e9a..98282435 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1668,11 +1668,9 @@ _git_notes () ;; esac ;; - add,--reuse-message=*|append,--reuse-message=*) - __gitcomp "$(__git_refs)" "" "${cur##--reuse-message=}" - ;; + add,--reuse-message=*|append,--reuse-message=*|\ add,--reedit-message=*|append,--reedit-message=*) - __gitcomp "$(__git_refs)" "" "${cur##--reedit-message=}" + __gitcomp "$(__git_refs)" "" "${cur#*=}" ;; add,--*|append,--*) __gitcomp '--file= --message= --reedit-message= -- 1.7.7.187.ga41de ``` ## SZEDER Gábor, 2011-10-08 01:09 Subject: [PATCH 2/2] completion: unite --format and --pretty for 'log' and 'show' Message-ID: <20111008010934.GC11561@goldbirke> URL: https://gitlist.dev/e/20111008010934.GC11561%40goldbirke In-Reply-To: <20111008010432.GA11561@goldbirke> ``` Signed-off-by: SZEDER Gábor --- contrib/completion/git-completion.bash | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 98282435..b36f9e70 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1553,14 +1553,9 @@ _git_log () merge="--merge" fi case "$cur" in - --pretty=*) + --pretty=*|--format=*) __gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases) - " "" "${cur##--pretty=}" - return - ;; - --format=*) - __gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases) - " "" "${cur##--format=}" + " "" "${cur#*=}" return ;; --date=*) @@ -2365,14 +2360,9 @@ _git_show () __git_has_doubledash && return case "$cur" in - --pretty=*) - __gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases) - " "" "${cur##--pretty=}" - return - ;; - --format=*) + --pretty=*|--format=*) __gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases) - " "" "${cur##--format=}" + " "" "${cur#*=}" return ;; --*) -- 1.7.7.187.ga41de ```