Merge branch 'sg/lock-file-commit-error' into maint

gitster · gitster · commit 1ff88560c8d2 · 2015-12-16T10:27:22.000-08:00
* sg/lock-file-commit-error:
  credential-store: don't pass strerror to die_errno()
diff --git a/credential-store.c b/credential-store.c
@@ -64,8 +64,7 @@ static void rewrite_credential_file(const char *fn, struct credential *c,
 		print_line(extra);
 	parse_credential_file(fn, c, NULL, print_line);
 	if (commit_lock_file(&credential_lock) < 0)
-		die_errno("unable to write credential store: %s",
-			  strerror(errno));
+		die_errno("unable to write credential store");
 }
 
 static void store_credential_file(const char *fn, struct credential *c)

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,7 @@ static void rewrite_credential_file(const char fn, struct credential c,`
`64`	`64`	`print_line(extra);`
`65`	`65`	`parse_credential_file(fn, c, NULL, print_line);`
`66`	`66`	`if (commit_lock_file(&credential_lock) < 0)`
`67`		`- die_errno("unable to write credential store: %s",`
`68`		`- strerror(errno));`
	`67`	`+ die_errno("unable to write credential store");`
`69`	`68`	`}`
`70`	`69`
`71`	`70`	`static void store_credential_file(const char fn, struct credential c)`