undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/apply' into next

Browse Source 
* jc/apply:
  apply --cached: do not check newly added file in the working tree
This commit is contained in:
Junio C Hamano 2006-05-17 16:56:20 -07:00
commit b312cc82b4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apply.c
View File

@ -1712,10 +1712,12 @@ static int check_patch(struct patch *patch)
if (new_name && (patch->is_new | patch->is_rename | patch->is_copy)) { if (new_name && (patch->is_new | patch->is_rename | patch->is_copy)) {
if (check_index && cache_name_pos(new_name, strlen(new_name)) >= 0) if (check_index && cache_name_pos(new_name, strlen(new_name)) >= 0)
return error("%s: already exists in index", new_name); return error("%s: already exists in index", new_name);
if (!cached && !lstat(new_name, &st)) if (!cached) {
if (!lstat(new_name, &st))
return error("%s: already exists in working directory", new_name); return error("%s: already exists in working directory", new_name);
if (errno != ENOENT) if (errno != ENOENT)
return error("%s: %s", new_name, strerror(errno)); return error("%s: %s", new_name, strerror(errno));
}
if (!patch->new_mode) { if (!patch->new_mode) {
if (patch->is_new) if (patch->is_new)
patch->new_mode = S_IFREG | 0644; patch->new_mode = S_IFREG | 0644;