Skip to content

Commit

Permalink
Add test to check recent fix to "git add -u"
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Benoit Sigoure authored and Junio C Hamano committed Sep 14, 2007
1 parent 42b5f86 commit 43b98ac
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion builtin-add.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
11 changes: 10 additions & 1 deletion t/t2200-add-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down Expand Up @@ -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

0 comments on commit 43b98ac

Please sign in to comment.