git@vger.kernel.org mailing list mirror (one of many)
 help / Atom feed
From: Kevin Daudt <me@ikke.info>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: 'pu' broken at t5304 tonight
Date: Sat, 10 Jun 2017 21:05:10 +0200
Message-ID: <20170610190510.GE27719@alpha.vpn.ikke.info> (raw)
In-Reply-To: <20170610124836.GD27719@alpha.vpn.ikke.info>

On Sat, Jun 10, 2017 at 02:48:36PM +0200, Kevin Daudt wrote:
> On Sat, Jun 10, 2017 at 03:07:01PM +0900, Junio C Hamano wrote:
> > I didn't check where it goes wrong.  Here is a list of suspects,
> > taken by
> > 
> >     $ git shortlog --no-merges pu@{8.hours}..pu
> > 
> > i.e. patches that weren't in pu before today's integration cycle.
> > 
> > Andreas Heiduk (1):
> >       doc: describe git svn init --ignore-refs
> > 
> > Brandon Williams (32):
> >       config: create config.h
> >       config: remove git_config_iter
> >       config: don't include config.h by default
> >       config: don't implicitly use gitdir
> >       setup: don't perform lazy initialization of repository state
> >       environment: remove namespace_len variable
> >       repository: introduce the repository object
> >       environment: place key repository state in the_repository
> >       environment: store worktree in the_repository
> >       setup: add comment indicating a hack
> >       config: read config from a repository object
> >       repository: add index_state to struct repo
> >       submodule-config: store the_submodule_cache in the_repository
> >       submodule: add repo_read_gitmodules
> >       submodule: convert is_submodule_initialized to work on a repository
> >       convert: convert get_cached_convert_stats_ascii to take an index
> >       convert: convert crlf_to_git to take an index
> >       convert: convert convert_to_git_filter_fd to take an index
> >       convert: convert convert_to_git to take an index
> >       convert: convert renormalize_buffer to take an index
> >       tree: convert read_tree to take an index parameter
> >       ls-files: convert overlay_tree_on_cache to take an index
> >       ls-files: convert write_eolinfo to take an index
> >       ls-files: convert show_killed_files to take an index
> >       ls-files: convert show_other_files to take an index
> >       ls-files: convert show_ru_info to take an index
> >       ls-files: convert ce_excluded to take an index
> >       ls-files: convert prune_cache to take an index
> >       ls-files: convert show_files to take an index
> >       ls-files: factor out debug info into a function
> >       ls-files: factor out tag calculation
> >       ls-files: use repository object
> > 
> > Jeff King (1):
> >       date: use localtime() for "-local" time formats
> > 
> > Johannes Schindelin (8):
> >       discover_git_directory(): avoid setting invalid git_dir
> >       config: report correct line number upon error
> >       help: use early config when autocorrecting aliases
> >       read_early_config(): optionally return the worktree's top-level directory
> >       t1308: relax the test verifying that empty alias values are disallowed
> >       t7006: demonstrate a problem with aliases in subdirectories
> >       alias_lookup(): optionally return top-level directory
> >       Use the early config machinery to expand aliases
> > 
> > Junio C Hamano (1):
> >       ### match next
> > 
> > Prathamesh Chavan (1):
> >       dir: create function count_slashes
> > 
> > SZEDER Gábor (5):
> >       revision.h: turn rev_info.early_output back into an unsigned int
> >       revision.c: stricter parsing of '--no-{min,max}-parents'
> >       revision.c: stricter parsing of '--early-output'
> >       revision.c: use skip_prefix() in handle_revision_opt()
> >       revision.c: use skip_prefix() in handle_revision_pseudo_opt()
> > 
> > Stefan Beller (1):
> >       t4005: modernize style and drop hard coded sha1
> > 
> 
> For me, this bisects to the latest merge:
> 
> 2047eebd3 (Merge branch 'bw/repo-object' into pu, 2017-06-10), but
> neither of the parent of the merge break this test, so it looks like
> it's because of an interaction between the repo-object topic and another
> topic.

Merging the repo-object with different other topic branches reveals this
topic to cause the bad interaction:

b56c91004 (Merge branch 'nd/prune-in-worktree' into pu, 2017-06-10)

Still investigating why it happens.

  reply index

Thread overview: 5+ messages in thread (expand / mbox.gz / Atom feed / [top])
2017-06-10  6:07 Junio C Hamano
2017-06-10 12:48 ` Kevin Daudt
2017-06-10 19:05   ` Kevin Daudt [this message]
2017-06-11  4:13     ` Christian Couder
2017-06-12 18:03       ` Brandon Williams

Reply instructions:

You may reply publically 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 to all the recipients using the --to, --cc,
  and --in-reply-to switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170610190510.GE27719@alpha.vpn.ikke.info \
    --to=me@ikke.info \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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

git@vger.kernel.org mailing list mirror (one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox