Merge branch 'jc/mv-d-to-d-error-message-fix'

gitster · gitster · commit a59dbae0b3bd · 2023-08-29T13:51:43.000-07:00
Typofix in an error message.

* jc/mv-d-to-d-error-message-fix:
  mv: fix error for moving directory to another
diff --git a/builtin/mv.c b/builtin/mv.c
@@ -305,7 +305,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 		}
 		if (S_ISDIR(st.st_mode)
 		    && lstat(dst, &dest_st) == 0) {
-			bad = _("cannot move directory over file");
+			bad = _("destination already exists");
 			goto act_on_entry;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ int cmd_mv(int argc, const char *argv, const char prefix)`
`305`	`305`	`}`
`306`	`306`	`if (S_ISDIR(st.st_mode)`
`307`	`307`	`&& lstat(dst, &dest_st) == 0) {`
`308`		`- bad = _("cannot move directory over file");`
	`308`	`+ bad = _("destination already exists");`
`309`	`309`	`goto act_on_entry;`
`310`	`310`	`}`
`311`	`311`