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

Merge branch 'rs/janitorial'

Browse Source 
Code clean-up.

* rs/janitorial:
  dir: remove unused variable sb
  clean: remove unused variable buf
  use file_exists() to check if a file exists in the worktree
This commit is contained in:
Junio C Hamano
2015-06-01 12:45:15 -07:00
parent f693bb0bb0 22570b68e3
commit 4ba5bb5531
7 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
submodule.c
View File

@ -891,7 +891,6 @@ int submodule_uses_gitfile(const char *path)
int ok_to_remove_submodule(const char *path)
{
struct stat st;
ssize_t len;
struct child_process cp = CHILD_PROCESS_INIT;
const char *argv[] = {
@ -904,7 +903,7 @@ int ok_to_remove_submodule(const char *path)
struct strbuf buf = STRBUF_INIT;
int ok_to_remove = 1;
if ((lstat(path, &st) < 0) || is_empty_dir(path))
if (!file_exists(path) || is_empty_dir(path))
return 1;
if (!submodule_uses_gitfile(path))