From: Benoit Sigoure Date: Fri, 14 Sep 2007 08:29:04 +0000 (+0200) Subject: Add test to check recent fix to "git add -u" X-Git-Tag: v1.5.3.2~19 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=43b98acc23306fd7fff888477937063361a09593;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin-add.c b/builtin-add.c index 9847b7e01..3d8b8b4f8 100644 --- 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: - 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: diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh index 61d08bb43..eb1ced3c3 100755 --- 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 && + echo initial >foo && 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 && @@ -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