On Wed, May 18, 2016 at 2:00 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Karthik Nayak <karthik.188@xxxxxxxxx> writes:
>
>> Sorry for that.
>> The only reason I haven't based it on 'master' is because it doesn't contain
>> 'f307218'.
>>
>> ➔ git branch --contains=f307218
>> next
>> ref-filter
>
> It is not clear from the above what your local ref-filter contains
> beyond 'master', so it is not very useful to me when I am trying to
> help you to avoid taking this topic hostage to all the topics in
> 'next' (if I queued this directly on 'next', I have to hold this
> series until all the topics in 'next' graduates to 'master).
>
> The series certainly would not apply to f307218 at all; it depends
> on other stuff you have either in your local 'ref-filter' or 'next'.
> It does not apply to the result of a merge of 'es/test-gpg-tags' topic
> into 'master', either, but the above does not make it clear what
> else you are using from 'next' at all.
>
> In any case, I think I managed to reduce the dependency on only
> 'es/test-gpg-tags' and 'master', and that is what I'll be queuing.
> Please double check the patches in kn/ref-filter-branch-list topic
> and also the merge of it into 'pu' for mismerges.
>
> The difference between the result of merging the previously queued
> one to 'pu', and the result of merging this round to 'pu', looks
> like the attached.
>
> Thanks.
>
> builtin/branch.c | 2 +-
> ref-filter.c | 6 ++++--
> t/t6302-for-each-ref-filter.sh | 30 +++++++++++++++---------------
> 3 files changed, 20 insertions(+), 18 deletions(-)
>
> diff --git a/builtin/branch.c b/builtin/branch.c
> index 0bbb4de..2412738 100644
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -293,7 +293,7 @@ static int calc_maxwidth(struct ref_array *refs, int remote_bonus)
> skip_prefix(it->refname, "refs/remotes/", &desc);
> if (it->kind == FILTER_REFS_DETACHED_HEAD) {
> char *head_desc = get_head_description();
> - w = strlen(head_desc);
> + w = utf8_strwidth(head_desc);
> free(head_desc);
> } else
> w = utf8_strwidth(desc);
> diff --git a/ref-filter.c b/ref-filter.c
> index 74c4869..f25671c 100644
> --- a/ref-filter.c
> +++ b/ref-filter.c
> @@ -1196,12 +1196,14 @@ char *get_head_description(void)
> strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
> state.branch);
> else if (state.detached_from) {
> - /* TRANSLATORS: make sure these match _("HEAD detached at ")
> - and _("HEAD detached from ") in wt-status.c */
> if (state.detached_at)
> + /* TRANSLATORS: make sure this matches
> + "HEAD detached at " in wt-status.c */
> strbuf_addf(&desc, _("(HEAD detached at %s)"),
> state.detached_from);
> else
> + /* TRANSLATORS: make sure this matches
> + "HEAD detached from " in wt-status.c */
> strbuf_addf(&desc, _("(HEAD detached from %s)"),
> state.detached_from);
> }
> diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh
> index 331d978..a09a1a4 100755
> --- a/t/t6302-for-each-ref-filter.sh
> +++ b/t/t6302-for-each-ref-filter.sh
> @@ -342,22 +342,22 @@ test_expect_success 'improper usage of %(if), %(then), %(else) and %(end) atoms'
> '
>
> test_expect_success 'check %(if)...%(then)...%(end) atoms' '
> - git for-each-ref --format="%(if)%(authorname)%(then)%(authorname): %(refname)%(end)" >actual &&
> + git for-each-ref --format="%(refname)%(if)%(authorname)%(then) Author: %(authorname)%(end)" >actual &&
> cat >expect <<-\EOF &&
> - A U Thor: refs/heads/master
> - A U Thor: refs/heads/side
> - A U Thor: refs/odd/spot
> -
> -
> -
> - A U Thor: refs/tags/foo1.10
> - A U Thor: refs/tags/foo1.3
> - A U Thor: refs/tags/foo1.6
> - A U Thor: refs/tags/four
> - A U Thor: refs/tags/one
> -
> - A U Thor: refs/tags/three
> - A U Thor: refs/tags/two
> + refs/heads/master Author: A U Thor
> + refs/heads/side Author: A U Thor
> + refs/odd/spot Author: A U Thor
> + refs/tags/annotated-tag
> + refs/tags/doubly-annotated-tag
> + refs/tags/doubly-signed-tag
> + refs/tags/foo1.10 Author: A U Thor
> + refs/tags/foo1.3 Author: A U Thor
> + refs/tags/foo1.6 Author: A U Thor
> + refs/tags/four Author: A U Thor
> + refs/tags/one Author: A U Thor
> + refs/tags/signed-tag
> + refs/tags/three Author: A U Thor
> + refs/tags/two Author: A U Thor
> EOF
> test_cmp expect actual
> '
>
Seems to be right, Thanks for putting in the extra effort, Will ensure
this doesn't
happen again from my side.
--
Regards,
Karthik Nayak
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html