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

Merge branch 'maint'

Browse Source 
* maint:
  apply: remove directory that becomes empty by renaming the last file away
  setup.c:verify_non_filename(): don't die unnecessarily while disambiguating
This commit is contained in:
Junio C Hamano
2007-08-06 01:37:10 -07:00
parent a76c2acb28 93969438dc
commit a6954452ec
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-apply.c
View File

@ -2508,7 +2508,7 @@ static void write_out_one_result(struct patch *patch, int phase)
* thing: remove the old, write the new * thing: remove the old, write the new
*/ */
if (phase == 0) if (phase == 0)
remove_file(patch, 0); remove_file(patch, patch->is_rename);
if (phase == 1) if (phase == 1)
create_file(patch); create_file(patch);
} }

2
setup.c
View File

@ -107,7 +107,7 @@ void verify_non_filename(const char *prefix, const char *arg)
if (!lstat(name, &st)) if (!lstat(name, &st))
die("ambiguous argument '%s': both revision and filename\n" die("ambiguous argument '%s': both revision and filename\n"
"Use '--' to separate filenames from revisions", arg); "Use '--' to separate filenames from revisions", arg);
if (errno != ENOENT) if (errno != ENOENT && errno != ENOTDIR)
die("'%s': %s", arg, strerror(errno)); die("'%s': %s", arg, strerror(errno));
} }