From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Nov 2023 07:53:22 +0000 (+0900)
Subject: Merge branch 'jc/mv-d-to-d-error-message-fix' into maint-2.42
X-Git-Tag: v2.42.1~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c7f6d828b5001feb138dd91bec12bffcf57e508;p=thirdparty%2Fgit.git

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

Typofix in an error message.

* jc/mv-d-to-d-error-message-fix:
  mv: fix error for moving directory to another
---

7c7f6d828b5001feb138dd91bec12bffcf57e508
diff --cc builtin/mv.c
index 05e7156034,80fc7a3c70..c596515ad0
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@@ -304,8 -303,8 +304,8 @@@ int cmd_mv(int argc, const char **argv
  			goto act_on_entry;
  		}
  		if (S_ISDIR(st.st_mode)
 -		    && lstat(dst, &st) == 0) {
 +		    && lstat(dst, &dest_st) == 0) {
- 			bad = _("cannot move directory over file");
+ 			bad = _("destination already exists");
  			goto act_on_entry;
  		}