* [BUG] git mv file directory/ creates the file directory @ 2013-12-02 10:04 Matthieu Moy 2013-12-02 13:35 ` Duy Nguyen 0 siblings, 1 reply; 3+ messages in thread From: Matthieu Moy @ 2013-12-02 10:04 UTC (permalink / raw) To: git Hi, When directory/ does not exist, I'd expect this to fail: git mv existing-file directory/ (note the trailing slash, to make it clear that directory/ is a directory). Unix's mv does fail: $ mv existing-file directory/ mv: cannot move `existing-file' to `directory/': Not a directory Instead, "git mv" seems to do the equivalent of git mv existing-file directory # without trailing slash -- Matthieu Moy http://www-verimag.imag.fr/~moy/ ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [BUG] git mv file directory/ creates the file directory 2013-12-02 10:04 [BUG] git mv file directory/ creates the file directory Matthieu Moy @ 2013-12-02 13:35 ` Duy Nguyen 2013-12-02 17:07 ` Matthieu Moy 0 siblings, 1 reply; 3+ messages in thread From: Duy Nguyen @ 2013-12-02 13:35 UTC (permalink / raw) To: Matthieu Moy; +Cc: git On Mon, Dec 02, 2013 at 11:04:06AM +0100, Matthieu Moy wrote: > Hi, > > When directory/ does not exist, I'd expect this to fail: > > git mv existing-file directory/ > > (note the trailing slash, to make it clear that directory/ is a > directory). Unix's mv does fail: > > $ mv existing-file directory/ > mv: cannot move `existing-file' to `directory/': Not a directory > > Instead, "git mv" seems to do the equivalent of > > git mv existing-file directory # without trailing slash This may be a start. Does not seem to break anything.. -- 8< -- diff --git a/builtin/mv.c b/builtin/mv.c index 2e0e61b..0fcccd5 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -16,9 +16,12 @@ static const char * const builtin_mv_usage[] = { NULL }; +#define DUP_BASENAME 1 +#define KEEP_TRAILING_SLASH 2 + static const char **internal_copy_pathspec(const char *prefix, const char **pathspec, - int count, int base_name) + int count, unsigned flags) { int i; const char **result = xmalloc((count + 1) * sizeof(const char *)); @@ -27,11 +30,12 @@ static const char **internal_copy_pathspec(const char *prefix, for (i = 0; i < count; i++) { int length = strlen(result[i]); int to_copy = length; - while (to_copy > 0 && is_dir_sep(result[i][to_copy - 1])) + while (!(flags & KEEP_TRAILING_SLASH) && + to_copy > 0 && is_dir_sep(result[i][to_copy - 1])) to_copy--; - if (to_copy != length || base_name) { + if (to_copy != length || flags & DUP_BASENAME) { char *it = xmemdupz(result[i], to_copy); - if (base_name) { + if (flags & DUP_BASENAME) { result[i] = xstrdup(basename(it)); free(it); } else @@ -87,16 +91,16 @@ int cmd_mv(int argc, const char **argv, const char *prefix) source = internal_copy_pathspec(prefix, argv, argc, 0); modes = xcalloc(argc, sizeof(enum update_mode)); - dest_path = internal_copy_pathspec(prefix, argv + argc, 1, 0); + dest_path = internal_copy_pathspec(prefix, argv + argc, 1, KEEP_TRAILING_SLASH); submodule_gitfile = xcalloc(argc, sizeof(char *)); if (dest_path[0][0] == '\0') /* special case: "." was normalized to "" */ - destination = internal_copy_pathspec(dest_path[0], argv, argc, 1); + destination = internal_copy_pathspec(dest_path[0], argv, argc, DUP_BASENAME); else if (!lstat(dest_path[0], &st) && S_ISDIR(st.st_mode)) { dest_path[0] = add_slash(dest_path[0]); - destination = internal_copy_pathspec(dest_path[0], argv, argc, 1); + destination = internal_copy_pathspec(dest_path[0], argv, argc, DUP_BASENAME); } else { if (argc != 1) die("destination '%s' is not a directory", dest_path[0]); -- 8< -- ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [BUG] git mv file directory/ creates the file directory 2013-12-02 13:35 ` Duy Nguyen @ 2013-12-02 17:07 ` Matthieu Moy 0 siblings, 0 replies; 3+ messages in thread From: Matthieu Moy @ 2013-12-02 17:07 UTC (permalink / raw) To: Duy Nguyen; +Cc: git Duy Nguyen <pclouds@gmail.com> writes: > This may be a start. Does not seem to break anything.. I did not thoroughly review/test, but it does fix my case. Below is the same patch with one test case. No time to do more right now. Thanks, >From 99985341ed1312cf6a7b63e14be7da0d51c701b4 Mon Sep 17 00:00:00 2001 From: Matthieu Moy <Matthieu.Moy@imag.fr> Date: Mon, 2 Dec 2013 18:03:20 +0100 Subject: [PATCH] WIP: error out on git mv file no-such-dir/ --- builtin/mv.c | 18 +++++++++++------- t/t7001-mv.sh | 9 +++++++++ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/builtin/mv.c b/builtin/mv.c index 2e0e61b..0fcccd5 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -16,9 +16,12 @@ static const char * const builtin_mv_usage[] = { NULL }; +#define DUP_BASENAME 1 +#define KEEP_TRAILING_SLASH 2 + static const char **internal_copy_pathspec(const char *prefix, const char **pathspec, - int count, int base_name) + int count, unsigned flags) { int i; const char **result = xmalloc((count + 1) * sizeof(const char *)); @@ -27,11 +30,12 @@ static const char **internal_copy_pathspec(const char *prefix, for (i = 0; i < count; i++) { int length = strlen(result[i]); int to_copy = length; - while (to_copy > 0 && is_dir_sep(result[i][to_copy - 1])) + while (!(flags & KEEP_TRAILING_SLASH) && + to_copy > 0 && is_dir_sep(result[i][to_copy - 1])) to_copy--; - if (to_copy != length || base_name) { + if (to_copy != length || flags & DUP_BASENAME) { char *it = xmemdupz(result[i], to_copy); - if (base_name) { + if (flags & DUP_BASENAME) { result[i] = xstrdup(basename(it)); free(it); } else @@ -87,16 +91,16 @@ int cmd_mv(int argc, const char **argv, const char *prefix) source = internal_copy_pathspec(prefix, argv, argc, 0); modes = xcalloc(argc, sizeof(enum update_mode)); - dest_path = internal_copy_pathspec(prefix, argv + argc, 1, 0); + dest_path = internal_copy_pathspec(prefix, argv + argc, 1, KEEP_TRAILING_SLASH); submodule_gitfile = xcalloc(argc, sizeof(char *)); if (dest_path[0][0] == '\0') /* special case: "." was normalized to "" */ - destination = internal_copy_pathspec(dest_path[0], argv, argc, 1); + destination = internal_copy_pathspec(dest_path[0], argv, argc, DUP_BASENAME); else if (!lstat(dest_path[0], &st) && S_ISDIR(st.st_mode)) { dest_path[0] = add_slash(dest_path[0]); - destination = internal_copy_pathspec(dest_path[0], argv, argc, 1); + destination = internal_copy_pathspec(dest_path[0], argv, argc, DUP_BASENAME); } else { if (argc != 1) die("destination '%s' is not a directory", dest_path[0]); diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index b90e985..7e74bf3 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -72,6 +72,15 @@ rm -f idontexist untracked1 untracked2 \ .git/index.lock test_expect_success \ + 'moving to target with trailing slash' \ + 'test_must_fail git mv path0/COPYING no-such-dir/ && + git mv path0/ no-such-dir/' + +test_expect_success \ + 'clean up' \ + 'git reset --hard' + +test_expect_success \ 'adding another file' \ 'cp "$TEST_DIRECTORY"/../README path0/README && git add path0/README && -- 1.8.5.rc3.4.g8bd3721 -- Matthieu Moy http://www-verimag.imag.fr/~moy/ ^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-12-02 17:08 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-12-02 10:04 [BUG] git mv file directory/ creates the file directory Matthieu Moy 2013-12-02 13:35 ` Duy Nguyen 2013-12-02 17:07 ` Matthieu Moy
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).