Merge branch 'en/dir-traversal'

gitster · gitster · commit 329d63e7be04 · 2021-05-28T13:03:00.000+09:00
Fix-up to a topic that is already in 'master'.

* en/dir-traversal:
  dir: introduce readdir_skip_dot_and_dotdot() helper
  dir: update stale description of treat_directory()
  Revert "dir: update stale description of treat_directory()"
  Revert "dir: introduce readdir_skip_dot_and_dotdot() helper"
diff --git a/dir.c b/dir.c
@@ -59,8 +59,7 @@ void dir_init(struct dir_struct *dir)
 	memset(dir, 0, sizeof(*dir));
 }
 
-struct dirent *
-readdir_skip_dot_and_dotdot(DIR *dirp)
+struct dirent *readdir_skip_dot_and_dotdot(DIR *dirp)
 {
 	struct dirent *e;
 

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,7 @@ void dir_init(struct dir_struct *dir)`
`59`	`59`	`memset(dir, 0, sizeof(*dir));`
`60`	`60`	`}`
`61`	`61`
`62`		`-struct dirent *`
`63`		`-readdir_skip_dot_and_dotdot(DIR *dirp)`
	`62`	`+struct dirent readdir_skip_dot_and_dotdot(DIR dirp)`
`64`	`63`	`{`
`65`	`64`	`struct dirent *e;`
`66`	`65`