Skip to content

git-mv: improve error message for conflicted file #678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

git-mv: improve error message for conflicted file #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions builtin/mv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
struct stat st;
struct string_list src_for_dst = STRING_LIST_INIT_NODUP;
struct lock_file lock_file = LOCK_INIT;
struct cache_entry *ce;

git_config(git_default_config, NULL);

Expand Down Expand Up @@ -220,9 +221,11 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
}
argc += last - first;
}
} else if (cache_name_pos(src, length) < 0)
} else if (!(ce = cache_file_exists(src, length, ignore_case))) {
bad = _("not under version control");
else if (lstat(dst, &st) == 0 &&
} else if (ce_stage(ce)) {
bad = _("conflicted");
} else if (lstat(dst, &st) == 0 &&
(!ignore_case || strcasecmp(src, dst))) {
bad = _("destination exists");
if (force) {
Expand Down
17 changes: 17 additions & 0 deletions t/t7001-mv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,23 @@ 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 &&
>conflict &&
test_when_finished "rm -f conflict" &&
cfhash=$(git hash-object -w conflict) &&
q_to_tab <<-EOF | git update-index --index-info &&
0 $cfhash 0Qconflict
100644 $cfhash 1Qconflict
EOF

test_must_fail git mv conflict newname 2>actual &&
test_i18ngrep "conflicted" actual
'

test_expect_success 'git mv should overwrite symlink to a file' '

rm -fr .git &&
Expand Down