Merge branch 'rj/add-chmod-error-message' into maint

gitster · gitster · commit 70def2c47fd5 · 2017-09-10T17:03:00.000+09:00
Message fix.

* rj/add-chmod-error-message:
  builtin/add: add detail to a 'cannot chmod' error message
diff --git a/builtin/add.c b/builtin/add.c
@@ -32,7 +32,7 @@ struct update_callback_data {
 	int add_errors;
 };
 
-static void chmod_pathspec(struct pathspec *pathspec, int force_mode)
+static void chmod_pathspec(struct pathspec *pathspec, char flip)
 {
 	int i;
 
@@ -42,8 +42,8 @@ static void chmod_pathspec(struct pathspec *pathspec, int force_mode)
 		if (pathspec && !ce_path_match(ce, pathspec, NULL))
 			continue;
 
-		if (chmod_cache_entry(ce, force_mode) < 0)
-			fprintf(stderr, "cannot chmod '%s'", ce->name);
+		if (chmod_cache_entry(ce, flip) < 0)
+			fprintf(stderr, "cannot chmod %cx '%s'\n", flip, ce->name);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ struct update_callback_data {`
`32`	`32`	`int add_errors;`
`33`	`33`	`};`
`34`	`34`
`35`		`-static void chmod_pathspec(struct pathspec *pathspec, int force_mode)`
	`35`	`+static void chmod_pathspec(struct pathspec *pathspec, char flip)`
`36`	`36`	`{`
`37`	`37`	`int i;`
`38`	`38`
`@@ -42,8 +42,8 @@ static void chmod_pathspec(struct pathspec *pathspec, int force_mode)`
`42`	`42`	`if (pathspec && !ce_path_match(ce, pathspec, NULL))`
`43`	`43`	`continue;`
`44`	`44`
`45`		`- if (chmod_cache_entry(ce, force_mode) < 0)`
`46`		`- fprintf(stderr, "cannot chmod '%s'", ce->name);`
	`45`	`+ if (chmod_cache_entry(ce, flip) < 0)`
	`46`	`+ fprintf(stderr, "cannot chmod %cx '%s'\n", flip, ce->name);`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`