From: Joey Hess <id@joeyh.name>
To: git@vger.kernel.org
Subject: Re: [PATCH 4/4] use smudge-to-file in git checkout etc
Date: Thu, 16 Jun 2016 16:55:53 -0400 [thread overview]
Message-ID: <20160616205553.GA23176@kitenet.net> (raw)
In-Reply-To: <20160616203259.5886-5-joeyh@joeyh.name>
Joey Hess wrote:
> + int smudge_to_file = can_smudge_to_file(ce->name);
> if (ce_mode_s_ifmt == S_IFREG &&
> + ! smudge_to_file &&
> convert_to_working_tree(ce->name, new, size, &buf)) {
> free(new);
> new = strbuf_detach(&buf, &newsize);
> @@ -189,13 +193,29 @@ static int write_entry(struct cache_entry *ce,
> + if (! can_smudge_to_file(ce->name)) {
> + }
> + else {
> + close(fd);
> + convert_to_working_tree_filter_to_file(ce->name, path, new, size);
Oops, I had meant to avoid using smudge-to-file when
e_mode_s_ifmt != S_IFREG, and forgot it in this patch, so it does the
wrong thing for symlinks.
I'll send an updated patch set fixing this after any other review.
--
see shy jo
prev parent reply other threads:[~2016-06-16 20:55 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-16 20:32 [PATCH 0/4] extend smudge/clean filters with direct file access Joey Hess
2016-06-16 20:32 ` [PATCH 1/4] clarify %f documentation Joey Hess
2016-06-16 21:33 ` Junio C Hamano
2016-06-17 2:48 ` Joey Hess
2016-06-17 3:25 ` Junio C Hamano
2016-06-17 12:32 ` Joey Hess
2016-06-17 15:57 ` Junio C Hamano
2016-06-16 20:32 ` [PATCH 2/4] add smudge-to-file and clean-from-file filter configuration Joey Hess
2016-06-16 21:57 ` Junio C Hamano
2016-06-17 13:13 ` Joey Hess
2016-06-17 18:26 ` Junio C Hamano
2016-06-17 6:05 ` Eric Sunshine
2016-06-17 9:36 ` Michael J Gruber
2016-06-17 12:47 ` Joey Hess
2016-06-17 16:09 ` Junio C Hamano
2016-06-17 17:29 ` Junio C Hamano
2016-06-17 17:37 ` Joey Hess
2016-06-17 18:06 ` Joey Hess
2016-06-17 18:24 ` Junio C Hamano
2016-06-16 20:32 ` [PATCH 3/4] use clean-from-file in git add Joey Hess
2016-06-16 20:32 ` [PATCH 4/4] use smudge-to-file in git checkout etc Joey Hess
2016-06-16 20:55 ` Joey Hess [this message]
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=20160616205553.GA23176@kitenet.net \
--to=id@joeyh.name \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.