From: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
To: Kirill Smelkov <kirr@landau•phys.spbu.ru>
Cc: "Junio C Hamano" <gitster@pobox•com>,
git@vger•kernel.org, "Axel Bonnet" <axel.bonnet@ensimag•imag.fr>,
"Clément Poulain" <clement.poulain@ensimag•imag.fr>,
"Diane Gasselin" <diane.gasselin@ensimag•imag.fr>
Subject: Re: [PATCH 3/3] RFC: blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''
Date: Sat, 18 Sep 2010 21:04:00 +0200 [thread overview]
Message-ID: <vpqmxrevppb.fsf@bauges.imag.fr> (raw)
In-Reply-To: <7ab60e32582447ad792602ff405dcee464ef1414.1284830388.git.kirr@landau.phys.spbu.ru> (Kirill Smelkov's message of "Sat\, 18 Sep 2010 21\:25\:06 +0400")
Kirill Smelkov <kirr@landau•phys.spbu.ru> writes:
> I don't know blame code well, and I'm not sure I'm doing it right or
> otherwise without mistakes. Thus an RFC.
I don't know the code well either, but I didn't see any obvious
problem in your code.
> --- a/sha1_name.c
> +++ b/sha1_name.c
> @@ -1068,7 +1068,7 @@ int get_sha1_with_context_1(const char *name, unsigned char *sha1,
> struct cache_entry *ce;
> int pos;
> if (namelen > 2 && name[1] == '/')
> - return get_sha1_oneline(name + 2, sha1);
> + return get_sha1_oneline(name + 2, sha1); /* XXX also mode? */
(This is the case where we're parsing ":/foo")
Currently, the mode is set a few lines above:
oc->mode = S_IFINVALID;
I guess this is OK since :/foo will return a commit sha1, not a file
sha1.
> @@ -1095,6 +1095,7 @@ int get_sha1_with_context_1(const char *name, unsigned char *sha1,
> break;
> if (ce_stage(ce) == stage) {
> hashcpy(sha1, ce->sha1);
> + oc->mode = ce->ce_mode; /* XXX ok? */
I'd say this is OK, you're setting the mode from the index. What was
the reason for your question mark?
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2010-09-18 19:09 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-18 17:25 [BUG, PATCH 0/3] Fix {blame,cat-file} --textconv for cases with symlinks Kirill Smelkov
2010-09-18 17:25 ` [PATCH 1/3] tests: Prepare --textconv tests for correctly-failing conversion program Kirill Smelkov
2010-09-18 19:14 ` Matthieu Moy
2010-09-20 20:35 ` Kirill Smelkov
2010-09-20 21:03 ` Matthieu Moy
2010-09-21 18:39 ` Kirill Smelkov
2010-09-18 17:25 ` [PATCH 2/3] blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks Kirill Smelkov
2010-09-18 19:26 ` Matthieu Moy
2010-09-18 17:25 ` [PATCH 3/3] RFC: blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664'' Kirill Smelkov
2010-09-18 19:04 ` Matthieu Moy [this message]
2010-09-20 18:21 ` Jeff King
2010-09-20 21:01 ` [PATCH] sha1_name.c: update comment to mention :/foo syntax Matthieu Moy
2010-09-21 18:02 ` Junio C Hamano
2010-09-21 20:06 ` Matthieu Moy
2010-09-21 23:29 ` Junio C Hamano
2010-09-24 16:43 ` [PATCH] update comment and documentation for " Matthieu Moy
2010-09-18 18:08 ` [BUG, PATCH 0/3] Fix {blame,cat-file} --textconv for cases with symlinks Matthieu Moy
2010-09-18 20:01 ` Junio C Hamano
2010-09-19 8:58 ` Matthieu Moy
2010-09-19 18:17 ` Junio C Hamano
2010-09-20 18:00 ` Jeff King
2010-09-20 20:18 ` Johannes Sixt
2010-09-21 17:57 ` Junio C Hamano
2010-09-21 18:42 ` Jeff King
2010-09-21 18:56 ` Jeff King
2010-09-21 20:59 ` [PATCH 0/2] better userdiff behavior for symlinks Jeff King
2010-09-21 21:01 ` [PATCH 1/2] diff: don't use pathname-based diff drivers " Jeff King
2010-09-22 5:40 ` Matthieu Moy
2010-09-22 5:50 ` Jeff King
2010-09-21 21:13 ` [PATCH 2/2] diff: add a special SYMLINK user-diff driver Jeff King
2010-09-22 0:12 ` Ævar Arnfjörð Bjarmason
2010-09-22 0:30 ` Jeff King
2010-09-22 0:39 ` Ævar Arnfjörð Bjarmason
2010-09-22 5:53 ` Matthieu Moy
2010-09-22 16:59 ` Matthieu Moy
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=vpqmxrevppb.fsf@bauges.imag.fr \
--to=matthieu.moy@grenoble-inp$(echo .)fr \
--cc=axel.bonnet@ensimag$(echo .)imag.fr \
--cc=clement.poulain@ensimag$(echo .)imag.fr \
--cc=diane.gasselin@ensimag$(echo .)imag.fr \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=kirr@landau$(echo .)phys.spbu.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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