mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] When copying or renaming, keep the mode, please

Browse Source 
Without this patch, git-apply does not retain the mode when renaming or
copying files.

[jc: Good catch, Johannes.  I added a test case to demonstrate the
breackage in the original.]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Johannes Schindelin
2005-08-17 09:01:07 +02:00
committed by Junio C Hamano
parent e4aec26f80
commit 35cc4bcd10
2 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apply.c
View File

@ -1043,8 +1043,12 @@ static int check_patch(struct patch *patch)
return error("%s: already exists in working directory", new_name);
if (errno != ENOENT)
return error("%s: %s", new_name, strerror(errno));
if (!patch->new_mode)
patch->new_mode = S_IFREG | 0644;
if (!patch->new_mode) {
if (patch->is_new)
patch->new_mode = S_IFREG | 0644;
else
patch->new_mode = patch->old_mode;
}
}
if (new_name && old_name) {