Re: [PATCH] Preserve file permissions on git-reflog expire

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 15, 2008, 17:54 UTC
Message-ID: <7v3aix4ud4.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <48F629C2.70203@datacom.ind.br>

Samuel Lucas Vaz de Mello <samuellucas@datacom.ind.br> writes:

> Preserve file permissions on git-reflog expire to avoid problems with shared repositories and git-gc.

Looong line needs wrapped (I could do this myself if this was the only issue, but...)

Show 5 quoted lines

> Signed-off-by: Samuel Lucas Vaz de Mello <samuellucas@datacom.ind.br>
>
> ---
>
> This small patch fixes a bug with shared repositories and git-reflog expire.

Show 10 quoted lines

> samuel@erdinger:~/myrepo$ git push 
> Counting objects: 5, done.
> Compressing objects: 100% (3/3), done.
> Unpacking objects: 100% (3/3), done.
> Writing objects: 100% (3/3), 295 bytes, done.
> Total 3 (delta 2), reused 0 (delta 0)
> error: Unable to append to logs/refs/heads/master: Permission denied 
> To /remote/myrepo/
> ! [remote rejected] master -> master (failed to write)
> error: failed to push some refs to '/remote/myrepo/'

Thanks for a reproduction recipe. I think an abbreviated version of this would deserve to be in the commit log message proper.

Show 18 quoted lines

> diff --git a/builtin-reflog.c b/builtin-reflog.c
> index 6b3667e..92a0d53 100644
> --- a/builtin-reflog.c
> +++ b/builtin-reflog.c
> @@ -265,6 +265,7 @@ static int expire_reflog(const char *ref, const unsigned char *sha1, int unused,
>  	struct cmd_reflog_expire_cb *cmd = cb_data;
>  	struct expire_reflog_cb cb;
>  	struct ref_lock *lock;
> +	struct stat filestat;
>  	char *log_file, *newlog_path = NULL;
>  	int status = 0;
>  
> @@ -303,6 +304,10 @@ static int expire_reflog(const char *ref, const unsigned char *sha1, int unused,
>  			status |= error("Couldn't write %s",
>  				lock->lk->filename);
>  			unlink(newlog_path);
> +		} else if (stat(log_file, &filestat)){
> +			status |= error("unable to read permissions of %s", log_file);

Hmmm. Is there a reason you did not use adjust_shared_perm() like all the other codepaths for creating files under .git/ directory do?