Re: [PATCH] completion: restore removed line continuating backslash
On Wed, Feb 15, 2017 at 3:41 AM, Junio C Hamano wrote: > SZEDER Gábor writes: > >>> If you feel uncomfortable and want these to cook longer, please tell >>> me so. >> >> Well, it was mainly my surprise that a 20+ patch series arriving so >> late that it gets queued on top of -rc0 would still make it into the >> release. > > It all depends on what area the changes are about ;-) Sure. I actually wanted to end that email with something like "and it's in contrib anyway :)", but by the time I got there I forgot about it.
Re: [PATCH] completion: restore removed line continuating backslash
SZEDER Gábor writes: >> If you feel uncomfortable and want these to cook longer, please tell >> me so. > > Well, it was mainly my surprise that a 20+ patch series arriving so > late that it gets queued on top of -rc0 would still make it into the > release. It all depends on what area the changes are about ;-) Not meaning to make light of your contribution, but if the upcoming version of Git shipped with a slightly broken completion, and the breakage is severe enough, the only thing we need to do is to do a maintenance release that reverts a single script. Distro packagers may do that for us. While waiting, the user can choose not to load the completion and can keep using Git just fine. A broken "mergetool" would be similar in that a workaround to inspect "git diff" is available. If we break "pull" or "commit" on the other hand, the necessary workaround would be a lot more involved. Some changes in low-impact areas can wait without reducing the end-user value of the new release, but if the risk of regression is small, I favour merging them, rather than postponing them for one cycle, if only to reduce the number of patches that I need to hold onto. Patches to clarify existing documentation fall into this category. My perception of "risk of regression" obviously is affected by the size of the series, and 20+ is certainly on the larger side. But other things also come into the picture. Patches from an author who knows the area the patches touch very well and with track record of not causing embarrassing regressions, would make me feel safer than patches from others, for example.
Re: [PATCH] completion: restore removed line continuating backslash
On Mon, Feb 13, 2017 at 9:45 PM, Junio C Hamano wrote: > SZEDER Gábor writes: > >> Recent commit 1cd23e9e0 (completion: don't use __gitdir() for git >> commands, 2017-02-03) rewrapped a couple of long lines, and while >> doing so it inadvertently removed a '\' from the end of a line, thus >> breaking completion for 'git config remote.name.push '. >> >> Signed-off-by: SZEDER Gábor >> --- >> >> I wanted this to be a fixup!, but then noticed that this series is >> already in next, hence the proper commit message. > > We get "--format=... : command not found"? Yeah, that's the one. > Thanks for a set of sharp eyes. Heh. Sharp?! It took over five minutes to notice after I first got that error... Furthermore, that '\' was already missing in v1, almost a year ago :) >> I see the last What's cooking marks this series as "will merge to >> master". That doesn't mean that it will be in v2.12, does it? > > I actually was hoping that these can go in. Others that can (or > should) wait are marked as "Will cook in 'next'". > > If you feel uncomfortable and want these to cook longer, please tell > me so. Well, it was mainly my surprise that a 20+ patch series arriving so late that it gets queued on top of -rc0 would still make it into the release. However, I have been using this series with only minor modifications for the better part of a year now, so it's unlikely that there will be any big issues with it. Maybe something small, like this missing '\', but we will deal with it when it arises. Gábor
Re: [PATCH] completion: restore removed line continuating backslash
SZEDER Gábor writes:
> Recent commit 1cd23e9e0 (completion: don't use __gitdir() for git
> commands, 2017-02-03) rewrapped a couple of long lines, and while
> doing so it inadvertently removed a '\' from the end of a line, thus
> breaking completion for 'git config remote.name.push '.
>
> Signed-off-by: SZEDER Gábor
> ---
>
> I wanted this to be a fixup!, but then noticed that this series is
> already in next, hence the proper commit message.
We get "--format=... : command not found"?
Thanks for a set of sharp eyes.
> I see the last What's cooking marks this series as "will merge to
> master". That doesn't mean that it will be in v2.12, does it?
I actually was hoping that these can go in. Others that can (or
should) wait are marked as "Will cook in 'next'".
If you feel uncomfortable and want these to cook longer, please tell
me so.
Thanks.
> contrib/completion/git-completion.bash | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/contrib/completion/git-completion.bash
> b/contrib/completion/git-completion.bash
> index 993085af6..f2b294aac 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -2086,7 +2086,7 @@ _git_config ()
> remote.*.push)
> local remote="${prev#remote.}"
> remote="${remote%.push}"
> - __gitcomp_nl "$(__git for-each-ref
> + __gitcomp_nl "$(__git for-each-ref \
> --format='%(refname):%(refname)' refs/heads)"
> return
> ;;
[PATCH] completion: restore removed line continuating backslash
Recent commit 1cd23e9e0 (completion: don't use __gitdir() for git
commands, 2017-02-03) rewrapped a couple of long lines, and while
doing so it inadvertently removed a '\' from the end of a line, thus
breaking completion for 'git config remote.name.push '.
Signed-off-by: SZEDER Gábor
---
I wanted this to be a fixup!, but then noticed that this series is
already in next, hence the proper commit message.
I see the last What's cooking marks this series as "will merge to
master". That doesn't mean that it will be in v2.12, does it?
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 993085af6..f2b294aac 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2086,7 +2086,7 @@ _git_config ()
remote.*.push)
local remote="${prev#remote.}"
remote="${remote%.push}"
- __gitcomp_nl "$(__git for-each-ref
+ __gitcomp_nl "$(__git for-each-ref \
--format='%(refname):%(refname)' refs/heads)"
return
;;
--
2.11.1.499.ge87add2e7
