git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [BUG?] bulk checkin does not respect filters
Date: Fri, 24 Feb 2012 02:54:25 -0500	[thread overview]
Message-ID: <20120224075425.GA18688@sigill.intra.peff.net> (raw)
In-Reply-To: <7vr4xk28z0.fsf@alter.siamese.dyndns.org>

On Thu, Feb 23, 2012 at 07:42:11PM -0800, Junio C Hamano wrote:

> It is a bit curious that anything filtered even goes to the streaming
> codepath, given this piece of code in write_entry() in entry.c:
> 
> 	if (ce_mode_s_ifmt == S_IFREG) {
> 		struct stream_filter *filter = get_stream_filter(path, ce->sha1);
> 		if (filter &&
> 		    !streaming_write_entry(ce, path, filter,
> 					   state, to_tempfile,
> 					   &fstat_done, &st))
> 			goto finish;
> 	}
> 
> and get_stream_filter() in convert.c has an explicit exception for this
> case at the very beginning:

I think it is because we don't follow that code path at all. The stack trace
for "git add" looks on a large file looks like:

#0  stream_to_pack (...) at bulk-checkin.c:101
#1  deflate_to_pack (...) at bulk-checkin.c:219
#2  index_bulk_checkin (...) at bulk-checkin.c:258
#3  index_stream (...) at sha1_file.c:2712
#4  index_fd (...) at sha1_file.c:2726
#5  index_path (...) at sha1_file.c:2742
#6  add_to_index (...) at read-cache.c:644
#7  add_file_to_index (...) at read-cache.c:673
#8  add_files (...) at builtin/add.c:363
#9  cmd_add (...) at builtin/add.c:474
#10 run_builtin (...) at git.c:324
#11 handle_internal_command (...) at git.c:484
#12 run_argv (...) at git.c:530
#13 main (...) at git.c:605 

Isn't write_entry the _other_ side of things. I.e., checking out, not
checking in? That side works fine (making the large file handling
for git-add even more odd. We will fail to apply the "clean" filter when
adding it, but we will apply the smudge filter when we write it out).

-Peff

  reply	other threads:[~2012-02-24  7:54 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-24  3:02 [BUG?] bulk checkin does not respect filters Jeff King
2012-02-24  3:17 ` Junio C Hamano
2012-02-24  3:42   ` Junio C Hamano
2012-02-24  7:54     ` Jeff King [this message]
2012-02-24 18:48       ` Junio C Hamano
2012-02-24  8:28   ` Jeff King
2012-02-24  9:39     ` Jeff King
2012-02-24  9:41       ` [PATCH 1/2] teach convert_to_git a "dry run" mode Jeff King
2012-02-24  9:48       ` [PATCH 2/2] do not stream large files to pack when filters are in use Jeff King
2012-02-24 20:03         ` Junio C Hamano
2012-02-24 20:48           ` Jeff King
2012-02-24 21:01             ` Jeff King
2012-02-24 21:20               ` Junio C Hamano
2012-02-24 21:19             ` Jeff King
2012-02-24 22:02               ` [PATCHv2 1/3] teach convert_to_git a "dry run" mode Jeff King
2012-02-24 22:05               ` [PATCHv2 2/3] teach dry-run convert_to_git not to require a src buffer Jeff King
2012-02-24 22:10               ` [PATCHv2 3/3] do not stream large files to pack when filters are in use Jeff King
2012-02-24 22:42               ` [PATCH 2/2] " Junio C Hamano
2012-02-24 20:03       ` [BUG?] bulk checkin does not respect filters Junio C Hamano

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120224075425.GA18688@sigill.intra.peff.net \
    --to=peff@peff.net \
    --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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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 NNTP newsgroup(s).