From: Chris Torek <chris.torek@xxxxxxxxx>
'git mv' has always complained about renaming a conflicted
file, as it cannot handle multiple index entries for one file.
However, the error message it uses has been the same as the
one for an untracked file:
fatal: not under version control, src=...
which is patently wrong. Distinguish the two cases and
add a test to make sure we produce the correct message.
Signed-off-by: Chris Torek <chris.torek@xxxxxxxxx>
---
git-mv: improve error message for conflicted file
'git mv' has always complained about renaming a conflicted file, as it
cannot handle multiple index entries for one file. However, the error
message it uses has been the same as the one for an untracked file:
fatal: not under version control, src=...
which is patently wrong. Distinguish the two cases and add a test to
make sure we produce the correct message.
Signed-off-by: Chris Torek chris.torek@xxxxxxxxx [chris.torek@xxxxxxxxx]
------------------------------------------------------------------------
A small note on the test: I originally had a different message text, so
the grep is slightly more general than necessary here. This leaves room
for a better message, though; I'm not sure mine is that great.
The error messages in general from 'git mv' could probably stand a lot
of cleanup. This is just a minimal fix for some particularly bad
behavior.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-678%2Fchris3torek%2Fgit-mv-message-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-678/chris3torek/git-mv-message-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/678
builtin/mv.c | 15 ++++++++++++---
t/t7001-mv.sh | 18 ++++++++++++++++++
2 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/builtin/mv.c b/builtin/mv.c
index be15ba7044..7dff121629 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -220,9 +220,18 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
}
argc += last - first;
}
- } else if (cache_name_pos(src, length) < 0)
- bad = _("not under version control");
- else if (lstat(dst, &st) == 0 &&
+ } else if (cache_name_pos(src, length) < 0) {
+ /*
+ * This occurs for both untracked files *and*
+ * files that are in merge-conflict state, so
+ * let's distinguish between those two.
+ */
+ struct cache_entry *ce = cache_file_exists(src, length, ignore_case);
+ if (ce == NULL)
+ bad = _("not under version control");
+ else
+ bad = _("must resolve merge conflict first");
+ } else if (lstat(dst, &st) == 0 &&
(!ignore_case || strcasecmp(src, dst))) {
bad = _("destination exists");
if (force) {
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 36b50d0b4c..b4974f9385 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -248,6 +248,24 @@ test_expect_success 'git mv should not change sha1 of moved cache entry' '
rm -f dirty dirty2
+# NB: This test is about the error message
+# as well as the failure.
+test_expect_success 'git mv error on conflicted file' '
+ rm -fr .git &&
+ git init &&
+ touch conflicted &&
+ cfhash=$(git hash-object -w conflicted) &&
+ git update-index --index-info <<-EOF &&
+ $(printf "0 $cfhash 0\tconflicted\n")
+ $(printf "100644 $cfhash 1\tconflicted\n")
+ EOF
+
+ test_must_fail git mv conflicted newname 2>actual &&
+ test_i18ngrep "merge.conflict" actual
+'
+
+rm -f conflicted
+
test_expect_success 'git mv should overwrite symlink to a file' '
rm -fr .git &&
base-commit: b6a658bd00c9c29e07f833cabfc0ef12224e277a
--
gitgitgadget
