From: Junio C Hamano <gitster@pobox.com>
To: "Torsten Bögershausen" <tboegi@web.de>
Cc: Antoine Pelisse <apelisse@gmail.com>,
Nguyen Thai Ngoc Duy <pclouds@gmail.com>,
Jeff King <peff@peff.net>,
git@vger.kernel.org
Subject: Re: [PATCH v2] status: always report ignored tracked directories
Date: Mon, 07 Jan 2013 09:50:40 -0800 [thread overview]
Message-ID: <7v4niskhlb.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <50EB0409.1090307@web.de> ("Torsten Bögershausen"'s message of "Mon, 07 Jan 2013 18:21:13 +0100")
Torsten Bögershausen <tboegi@web.de> writes:
> The bad news: the patch does not apply.
Huh, isn't this already queued as 22ccf86 (status: always report
ignored tracked directories, 2013-01-06)?
> The good news: t7061 passes on pu,
> and dir.c seems to be changes as needed:
>
> commit 1f4e17c6c9833f17dc6bbf045f8a8d6378dcb417
> Merge: dee1fa4 cc37e5b
> Author: Junio C Hamano <gitster@pobox.com>
> Date: Sun Jan 6 23:46:29 2013 -0800
>
> Merge branch 'nd/parse-pathspec' into pu
>
> which comes from Duy:
>
> commit cc37e5bf18ca11d9a884bddfebcdff61df3e6279
> Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> Date: Sun Jan 6 13:21:08 2013 +0700
>
> Convert more init_pathspec() to parse_pathspec()
Yes, it needs conflict resolution with other topics in flight, but
the thing to test is to see if the result of merging 22ccf86 into
the 'master' branch does what we want; the newer topic is still in
flux and we know it will be rerolled before it gets into testable
shape.
next prev parent reply other threads:[~2013-01-07 17:51 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-05 11:07 t7061: comments and one failure Torsten Bögershausen
2013-01-05 11:24 ` Jeff King
2013-01-05 11:29 ` Antoine Pelisse
2013-01-05 20:42 ` [PATCH] status: report ignored yet tracked directories Antoine Pelisse
2013-01-05 21:27 ` Torsten Bögershausen
2013-01-05 23:03 ` Jeff King
2013-01-06 16:40 ` Antoine Pelisse
2013-01-07 8:33 ` Jeff King
2013-01-06 22:09 ` [PATCH v2] status: always report ignored " Antoine Pelisse
2013-01-07 17:21 ` Torsten Bögershausen
2013-01-07 17:50 ` Junio C Hamano [this message]
2013-01-07 19:06 ` Junio C Hamano
2013-01-07 20:24 ` Antoine Pelisse
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=7v4niskhlb.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=apelisse@gmail.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=tboegi@web.de \
/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).