Add test to check recent fix to "git add -u"

An earlier commit fixed type-change case in "git add -u".
This adds a test to make sure we do not introduce regression.

At the same time, it fixes a stupid typo in the error message.

Signed-off-by: Benoit Sigoure <tsuna@lrde.epita.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-add.c b/builtin-add.c
index 9847b7e019ece82f19e3e5decf8647eb921c4291..3d8b8b4f89514e0a8f7af1c2c7dc2f8ae372129e 100644 (file)
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -95,7 +95,7 @@ static void update_callback(struct diff_queue_struct *q,
                const char *path = p->one->path;
                switch (p->status) {
                default:
                const char *path = p->one->path;
                switch (p->status) {
                default:

-                       die("unexpacted diff status %c", p->status);
+                       die("unexpected diff status %c", p->status);

                case DIFF_STATUS_UNMERGED:
                case DIFF_STATUS_MODIFIED:
                case DIFF_STATUS_TYPE_CHANGED:
                case DIFF_STATUS_UNMERGED:
                case DIFF_STATUS_MODIFIED:
                case DIFF_STATUS_TYPE_CHANGED:

diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index 61d08bb431ca18d6223e944cd4ca43fba6c1d332..eb1ced3c371ecaeab9d0dc14be888bf7df110483 100755 (executable)
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -16,11 +16,12 @@ only the updates to dir/sub.'
 test_expect_success setup '
        echo initial >check &&
        echo initial >top &&
 test_expect_success setup '
        echo initial >check &&
        echo initial >top &&

+       echo initial >foo &&

        mkdir dir1 dir2 &&
        echo initial >dir1/sub1 &&
        echo initial >dir1/sub2 &&
        echo initial >dir2/sub3 &&
        mkdir dir1 dir2 &&
        echo initial >dir1/sub1 &&
        echo initial >dir1/sub2 &&
        echo initial >dir2/sub3 &&

-       git add check dir1 dir2 top &&
+       git add check dir1 dir2 top foo &&

        test_tick
        git-commit -m initial &&
 
        test_tick
        git-commit -m initial &&
 


@@ -76,4 +77,12 @@ test_expect_success 'change gets noticed' '
 
 '
 
 
 '
 

+test_expect_success 'replace a file with a symlink' '
+
+       rm foo &&
+       ln -s top foo &&
+       git add -u -- foo
+
+'
+

 test_done
 test_done