Re: [PATCH] Be more careful with objects directory permissions on clone
- From
- Mark Hills <mark@pogo.org.uk>
- Date
- May 5, 2008, 16:46 UTC
- Message-ID
- <alpine.BSO.1.10.0805051742020.10940@zrgural.vwaro.pbz>
- In-Reply-To
- <481EE478.9000704@viscovery.net>
On Mon, 5 May 2008, Johannes Sixt wrote:
> Mark Hills schrieb:
Show 9 quoted lines
>> I tend to think that an inclusive match has less scope for future bad >> behaviour than an exclusive match. Have I missed the possiblity that >> there may be content in the objects directory which is not a directory >> or file? > > Theoretically, you could have symbolic links to loose objects or packs. > > Generally, you shouldn't change the behavior of a program more than > necessary.
Okay, here's a revised patch (I made a note about the cpio bug in the commit message too).
Thanks,
Mark
Be more careful with objects directory permissions on clone
Honour the setgid and umask when re-creating the objects directory at the destination.
cpio in copy-pass mode aims to copy file permissions which causes this problem and cannot be disabled. Be explicit by copying the directory structure first, honouring the permissions at the destination, then copy the files with 0444 permissions. This also avoids bugs in some versions of cpio.
Signed-off-by: Mark Hills <mark@pogo.org.uk> --- git-clone.sh | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/git-clone.sh b/git-clone.sh index 8c7fc7f..9d88d1c 100755 --- a/git-clone.sh +++ b/git-clone.sh @@ -334,7 +334,10 @@ yes) fi fi && cd "$repo" && - find objects -depth -print | cpio $cpio_quiet_flag -pumd$l "$GIT_DIR/" || \ + # Create dirs using umask and permissions and destination + find objects -type d -print | (cd "$GIT_DIR" && xargs mkdir -p) && + # Copy existing 0444 permissions on content + find objects ! -type d -print | cpio $cpio_quiet_flag -pumd$l "$GIT_DIR/" || \ exit 1 fi git-ls-remote "$repo" >"$GIT_DIR/CLONE_HEAD" || exit 1
-- 1.5.5.1.126.geeac