stash: avoid feeding directories to update-index

When a file is removed from the cache, but there is a file of the same
name present in the working directory, we would normally treat that file
in the working directory as untracked.  However, in the case of stash,
doing that would prevent a simple 'git stash push', because the untracked
file would be in the way of restoring the deleted file.

git stash, however, blindly assumes that whatever is in the working
directory for a deleted file is wanted and passes that path along to
update-index.  That causes problems when the working directory contains
a directory with the same name as the deleted file.  Add some code for
this special case that will avoid passing directory names to
update-index.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/stash.c b/builtin/stash.c
index 8f42360ca91385387a3da84c948023e0a3b06574..9ad2940f87af2c7d53fe97c44c5390c32d51d227 100644 (file)
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -313,6 +313,17 @@ static int reset_head(void)
        return run_command(&cp);
 }
 
+static int is_path_a_directory(const char *path)
+{
+       /*
+        * This function differs from abspath.c:is_directory() in that
+        * here we use lstat() instead of stat(); we do not want to
+        * follow symbolic links here.
+        */
+       struct stat st;
+       return (!lstat(path, &st) && S_ISDIR(st.st_mode));
+}
+
 static void add_diff_to_buf(struct diff_queue_struct *q,
                            struct diff_options *options,
                            void *data)
@@ -320,6 +331,9 @@ static void add_diff_to_buf(struct diff_queue_struct *q,
        int i;
 
        for (i = 0; i < q->nr; i++) {
+               if (is_path_a_directory(q->queue[i]->one->path))
+                       continue;
+
                strbuf_addstr(data, q->queue[i]->one->path);
 
                /* NUL-terminate: will be fed to update-index -z */

diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 7346f8d10373fdf14f4302d92fe79888170961e8..34d1ad9837f7466a1fd95776e4db1a60e19fdb34 100755 (executable)
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -1307,7 +1307,7 @@ test_expect_success 'stash -c stash.useBuiltin=false warning ' '
        test_must_be_empty err
 '
 
-test_expect_failure 'git stash succeeds despite directory/file change' '
+test_expect_success 'git stash succeeds despite directory/file change' '
        test_create_repo directory_file_switch_v1 &&
        (
                cd directory_file_switch_v1 &&