From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Mar 2014 18:08:31 +0000 (-0700)
Subject: Merge branch 'bb/diff-no-index-dotdot'
X-Git-Tag: v2.0.0-rc0~61
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/37943cc6b9a24c1636472f670aba972d12757ba7?ds=inline;hp=-c

Merge branch 'bb/diff-no-index-dotdot'

* bb/diff-no-index-dotdot:
diff-no-index: replace manual "."/".." check with is_dot_or_dotdot()
diff-no-index: rename read_directory()
---

37943cc6b9a24c1636472f670aba972d12757ba7
diff --combined diff-no-index.c
index 8e10bff30e,c881708ddd..c554691df0
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@@ -15,8 -15,9 +15,9 @@@
  #include "log-tree.h"
  #include "builtin.h"
  #include "string-list.h"
+ #include "dir.h"
  
- static int read_directory(const char *path, struct string_list *list)
+ static int read_directory_contents(const char *path, struct string_list *list)
  {
  	DIR *dir;
  	struct dirent *e;
@@@ -25,7 -26,7 +26,7 @@@
  		return error("Could not open directory %s", path);
  
  	while ((e = readdir(dir)))
- 		if (strcmp(".", e->d_name) && strcmp("..", e->d_name))
+ 		if (!is_dot_or_dotdot(e->d_name))
  			string_list_insert(list, e->d_name);
  
  	closedir(dir);
@@@ -107,9 -108,9 +108,9 @@@ static int queue_diff(struct diff_optio
  		int i1, i2, ret = 0;
  		size_t len1 = 0, len2 = 0;
  
- 		if (name1 && read_directory(name1, &p1))
+ 		if (name1 && read_directory_contents(name1, &p1))
  			return -1;
- 		if (name2 && read_directory(name2, &p2)) {
+ 		if (name2 && read_directory_contents(name2, &p2)) {
  			string_list_clear(&p1, 0);
  			return -1;
  		}
@@@ -186,6 -187,7 +187,6 @@@ void diff_no_index(struct rev_info *rev
  		   const char *prefix)
  {
  	int i, prefixlen;
 -	unsigned deprecated_show_diff_q_option_used = 0;
  	const char *paths[2];
  
  	diff_setup(&revs->diffopt);
@@@ -193,6 -195,10 +194,6 @@@
  		int j;
  		if (!strcmp(argv[i], "--no-index"))
  			i++;
 -		else if (!strcmp(argv[i], "-q")) {
 -			deprecated_show_diff_q_option_used = 1;
 -			i++;
 -		}
  		else if (!strcmp(argv[i], "--"))
  			i++;
  		else {
@@@ -225,6 -231,9 +226,6 @@@
  	revs->max_count = -2;
  	diff_setup_done(&revs->diffopt);
  
 -	if (deprecated_show_diff_q_option_used)
 -		handle_deprecated_show_diff_q(&revs->diffopt);
 -
  	setup_diff_pager(&revs->diffopt);
  	DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);