From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Aug 2023 20:51:43 +0000 (-0700)
Subject: Merge branch 'jc/mv-d-to-d-error-message-fix'
X-Git-Tag: v2.43.0-rc0~126
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a59dbae0b3bdacfc7ebad40f784f38d6333e8608;p=thirdparty%2Fgit.git

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

Typofix in an error message.

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

a59dbae0b3bdacfc7ebad40f784f38d6333e8608
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;
  		}