From: Dmitry Ivankov <divanorama@gmail.com>
To: git@vger.kernel.org
Subject: Re: [PATCH di/fast-import-deltified-tree] Windows: define S_ISUID properly
Date: Wed, 21 Sep 2011 07:38:18 +0000 (UTC) [thread overview]
Message-ID: <loom.20110921T092135-714@post.gmane.org> (raw)
In-Reply-To: 4E798538.7070106@viscovery.net
Johannes Sixt <j.sixt <at> viscovery.net> writes:
>
> From: Johannes Sixt <j6t <at> kdbg.org>
>
> 8fb3ad76 (fast-import: prevent producing bad delta) introduced the first
> use of S_ISUID. Since before this commit the value was irrelevant, we had
> only a dummy definition in mingw.h. But beginning with this commit the
> macro must expand to a reasonable value. Make it so.
>
> We do not change S_ISGID from the value 0 because it is used in path.c
> (via FORCE_DIR_SET_GID) to set the mode on directories in a manner that
> is not supported on Windows, and 0 is the right value in this case.
>
> Signed-off-by: Johannes Sixt <j6t <at> kdbg.org>
> ---
> compat/mingw.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/compat/mingw.h b/compat/mingw.h
> index 547568b..e2c89d6 100644
> --- a/compat/mingw.h
> +++ b/compat/mingw.h
> @@ -22,7 +22,7 @@ typedef int socklen_t;
> #define S_IWOTH 0
> #define S_IXOTH 0
> #define S_IRWXO (S_IROTH | S_IWOTH | S_IXOTH)
> -#define S_ISUID 0
> +#define S_ISUID 04000
> #define S_ISGID 0
> #define S_ISVTX 0
>
Ow, it's awkward that the issue was discussed in [1] but slipped and nobody
noticed, especially me being a patch sender.
If we choose patch from [1] I'd also change a comment to smth like
/*
* We abuse the 04000 bit on directories to mean "do not delta".
* It is a S_ISUID bit on setuid platforms and an unused bit on
* non-setuid platforms supported in git. In either case git ignores
* the bit, so it's safe to abuse it locally.
*/
[1] http://thread.gmane.org/gmane.comp.version-control.git/179223/focus=179762
next prev parent reply other threads:[~2011-09-21 7:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-21 6:33 [PATCH di/fast-import-deltified-tree] Windows: define S_ISUID properly Johannes Sixt
2011-09-21 7:38 ` Dmitry Ivankov [this message]
2011-09-21 12:07 ` Junio C Hamano
2011-09-21 12:08 ` Junio C Hamano
2011-09-21 13:44 ` Dmitry Ivankov
2011-09-21 15:13 ` 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=loom.20110921T092135-714@post.gmane.org \
--to=divanorama@gmail.com \
--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 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).