From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Karthik Nayak <karthik.188@gmail.com>
Cc: Git <git@vger.kernel.org>,
Christian Couder <christian.couder@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [RFC/PATCH 10/11] branch.c: use 'ref-filter' APIs
Date: Thu, 30 Jul 2015 09:29:00 +0200 [thread overview]
Message-ID: <vpqbneucddv.fsf@anie.imag.fr> (raw)
In-Reply-To: <CAOLa=ZTHRLTbmB7iadc3z7=-pshjR0QS8R_StZb7xOyu_gJ=Sw@mail.gmail.com> (Karthik Nayak's message of "Thu, 30 Jul 2015 12:07:58 +0530")
Karthik Nayak <karthik.188@gmail.com> writes:
> On Wed, Jul 29, 2015 at 9:26 PM, Matthieu Moy
> <Matthieu.Moy@grenoble-inp.fr> wrote:
>> Karthik Nayak <karthik.188@gmail.com> writes:
>>
>>> On Tue, Jul 28, 2015 at 7:47 PM, Matthieu Moy
>>> <Matthieu.Moy@grenoble-inp.fr> wrote:
>>>>
>>>> I'm not sure what's the convention, but I think the test description
>>>> should give the expected behavior even with test_expect_failure.
>>>>
>>>> And please help the reviewers by saying what's the status wrt this test
>>>> (any plan on how to fix it?).
>>>>
>>>
>>> On the other hand I wonder if the test is even needed as, we don't
>>> really need it
>>> Cause we remove that ability of branch.c by using filter_refs().
>>
>> Please read d0f810f (refs.c: allow listing and deleting badly named
>> refs, 2014-09-03). I think the reasoning makes sense, and we should keep
>> this ability.
>>
>
> This makes sense, I didn't have a thorough look at this but it breaks
> a little in
> ref-filter.c while getting object attributes. So is it okay to mark
> this as TODO?
Solving this doesn't seem much harder than
diff --git a/ref-filter.c b/ref-filter.c
index 6c0189f..a4df287 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1117,7 +1117,7 @@ static int ref_filter_handler(const char *refname, const struct object_id *oid,
struct commit *commit = NULL;
unsigned int kind;
- if (flag & REF_BAD_NAME) {
+ if (!filter->show_bad_name_refs && (flag & REF_BAD_NAME)) {
warning("ignoring ref with broken name %s", refname);
return 0;
}
diff --git a/ref-filter.h b/ref-filter.h
index 98ebd3b..b9d2bbc 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -79,7 +79,7 @@ struct ref_filter {
match_as_path : 1;
unsigned int lines, branch_kind;
int abbrev, verbose;
- int detached : 1;
+ int detached : 1, show_bad_name_refs : 1;
};
struct ref_filter_cbdata {
and setting filter->show_bad_name_refs when needed (untested). Did I
miss something?
IIRC, historicaly Git allowed some weirdly named refs which made some
commands ambiguous (e.g. a branch named after an option like '-d').
We're forbidding their creation so people shouldn't have any, but we
it's important to continue showing them in case some people have old
bad-named branches lying around.
I'd rather have the code strictly better after your contribution than
before.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2015-07-30 7:29 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-28 6:55 [RFC/PATCH] Port branch.c to use ref-filter APIs Karthik Nayak
2015-07-28 6:56 ` [RFC/PATCH 01/11] ref-filter: add "%(objectname:size=X)" option Karthik Nayak
2015-07-28 6:56 ` [RFC/PATCH 02/11] ref-filter: add 'colornext' atom Karthik Nayak
2015-07-28 8:45 ` Matthieu Moy
2015-07-28 16:03 ` Karthik Nayak
2015-07-28 9:13 ` Christian Couder
2015-07-28 16:04 ` Karthik Nayak
2015-07-29 20:10 ` Eric Sunshine
2015-07-29 21:30 ` Matthieu Moy
2015-07-30 4:27 ` Jacob Keller
2015-07-30 16:17 ` Junio C Hamano
2015-08-01 13:06 ` Karthik Nayak
2015-07-28 6:56 ` [RFC/PATCH 03/11] ref-filter: add option to filter only branches Karthik Nayak
2015-07-28 13:38 ` Matthieu Moy
2015-07-28 16:42 ` Karthik Nayak
2015-07-28 6:56 ` [RFC/PATCH 04/11] ref-filter: add 'ifexists' atom Karthik Nayak
2015-07-28 7:54 ` Jacob Keller
2015-07-28 16:47 ` Karthik Nayak
2015-07-28 8:50 ` Matthieu Moy
2015-07-28 17:39 ` Karthik Nayak
2015-07-28 17:57 ` Junio C Hamano
2015-07-29 17:48 ` Karthik Nayak
2015-07-29 18:00 ` Junio C Hamano
2015-07-29 18:56 ` Junio C Hamano
2015-07-29 21:21 ` Matthieu Moy
2015-07-29 22:05 ` Junio C Hamano
2015-08-01 6:46 ` Karthik Nayak
2015-08-01 7:05 ` Jacob Keller
2015-08-01 6:44 ` Karthik Nayak
2015-07-28 6:56 ` [RFC/PATCH 05/11] branch: fix width computation Karthik Nayak
2015-07-28 9:47 ` Matthieu Moy
2015-07-28 18:16 ` Karthik Nayak
2015-07-28 6:56 ` [RFC/PATCH 06/11] branch: roll show_detached HEAD into regular ref_list Karthik Nayak
2015-07-28 13:01 ` Matthieu Moy
2015-07-28 19:19 ` Karthik Nayak
2015-07-29 9:56 ` Matthieu Moy
2015-07-29 17:54 ` Karthik Nayak
2015-07-28 6:56 ` [RFC/PATCH 07/11] branch: move 'current' check down to the presentation layer Karthik Nayak
2015-07-28 13:09 ` Matthieu Moy
2015-07-28 20:12 ` Karthik Nayak
2015-07-29 0:46 ` Jacob Keller
2015-07-29 18:44 ` Karthik Nayak
2015-07-29 10:01 ` Matthieu Moy
2015-07-29 18:52 ` Karthik Nayak
2015-07-29 21:27 ` Matthieu Moy
2015-08-01 6:48 ` Karthik Nayak
2015-08-01 7:06 ` Jacob Keller
2015-08-01 9:03 ` Eric Sunshine
2015-08-02 12:59 ` Karthik Nayak
2015-08-02 17:58 ` Junio C Hamano
2015-07-28 6:56 ` [RFC/PATCH 08/11] branch: drop non-commit error reporting Karthik Nayak
2015-07-28 6:56 ` [RFC/PATCH 09/11] branch.c: use 'ref-filter' data structures Karthik Nayak
2015-07-28 8:17 ` Christian Couder
2015-07-28 13:48 ` Matthieu Moy
2015-07-28 20:41 ` Karthik Nayak
2015-07-29 10:08 ` Matthieu Moy
2015-07-29 19:38 ` Karthik Nayak
2015-07-28 20:38 ` Karthik Nayak
2015-07-28 8:22 ` Christian Couder
2015-07-28 20:31 ` Karthik Nayak
2015-07-28 8:42 ` [RFC/PATCH 01/11] ref-filter: add "%(objectname:size=X)" option Matthieu Moy
2015-07-28 15:54 ` Karthik Nayak
2015-07-28 15:43 ` Junio C Hamano
2015-07-28 15:55 ` Karthik Nayak
2015-07-28 16:19 ` Junio C Hamano
2015-07-29 16:02 ` Karthik Nayak
2015-07-28 7:11 ` [RFC/PATCH 10/11] branch.c: use 'ref-filter' APIs Karthik Nayak
2015-07-28 7:57 ` Jacob Keller
2015-07-29 3:46 ` Karthik Nayak
2015-07-28 8:09 ` Christian Couder
2015-07-29 3:48 ` Karthik Nayak
2015-07-28 14:17 ` Matthieu Moy
2015-07-29 15:32 ` Karthik Nayak
2015-07-29 15:46 ` Matthieu Moy
2015-07-29 15:37 ` Karthik Nayak
2015-07-29 15:56 ` Matthieu Moy
2015-07-30 6:37 ` Karthik Nayak
2015-07-30 7:29 ` Matthieu Moy [this message]
2015-08-03 10:20 ` Karthik Nayak
2015-08-19 15:49 ` Matthieu Moy
2015-08-19 15:52 ` Karthik Nayak
2015-07-28 7:11 ` [RFC/PATCH 11/11] branch: add '--points-at' option Karthik Nayak
2015-07-28 7:46 ` Jacob Keller
2015-07-29 15:44 ` Karthik Nayak
2015-07-28 13:35 ` [RFC/PATCH] Port branch.c to use ref-filter APIs Matthieu Moy
2015-07-28 15:48 ` Karthik Nayak
2015-07-28 17:53 ` Matthieu Moy
2015-07-29 15:54 ` Karthik Nayak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpqbneucddv.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=karthik.188@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).