diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2014-03-15 18:56:52 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-17 11:38:41 -0700 |
| commit | fb8a4e8079ab8fc37e9cde32957c35637280ab8f (patch) | |
| tree | 12553ebd139bfeeffcd746676afbc594c8837b25 /builtin/mv.c | |
| parent | 89ccc1b09cf4004e6129c66def42b47206ed6b5f (diff) | |
| download | git-fb8a4e8079ab8fc37e9cde32957c35637280ab8f.tar.gz git-fb8a4e8079ab8fc37e9cde32957c35637280ab8f.tar.xz | |
mv: prevent mismatched data when ignoring errors.
We shrink the source and destination arrays, but not the modes or
submodule_gitfile arrays, resulting in potentially mismatched data. Shrink
all the arrays at the same time to prevent this. Add tests to ensure the
problem does not recur.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/mv.c')
| -rw-r--r-- | builtin/mv.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin/mv.c b/builtin/mv.c index 525807722..45e57f307 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -231,6 +231,11 @@ int cmd_mv(int argc, const char **argv, const char *prefix) memmove(destination + i, destination + i + 1, (argc - i) * sizeof(char *)); + memmove(modes + i, modes + i + 1, + (argc - i) * sizeof(enum update_mode)); + memmove(submodule_gitfile + i, + submodule_gitfile + i + 1, + (argc - i) * sizeof(char *)); i--; } } else |