mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-27 20:14:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Benoit Sigoure 2007-09-14 10:29:04 +02:00 committed by Junio C Hamano
parent 42b5f8693e
commit 43b98acc23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-add.c
View File

@ -95,7 +95,7 @@ static void update_callback(struct diff_queue_struct *q,
const char *path = p->one->path; const char *path = p->one->path;
switch (p->status) { switch (p->status) {
default: default:
die("unexpacted diff status %c", p->status); die("unexpected diff status %c", p->status);
case DIFF_STATUS_UNMERGED: case DIFF_STATUS_UNMERGED:
case DIFF_STATUS_MODIFIED: case DIFF_STATUS_MODIFIED:
case DIFF_STATUS_TYPE_CHANGED: case DIFF_STATUS_TYPE_CHANGED:

11
t/t2200-add-update.sh
View File

@ -16,11 +16,12 @@ only the updates to dir/sub.'
test_expect_success setup ' test_expect_success setup '
echo initial >check && echo initial >check &&
echo initial >top && echo initial >top &&
echo initial >foo &&
mkdir dir1 dir2 && mkdir dir1 dir2 &&
echo initial >dir1/sub1 && echo initial >dir1/sub1 &&
echo initial >dir1/sub2 && echo initial >dir1/sub2 &&
echo initial >dir2/sub3 && echo initial >dir2/sub3 &&
git add check dir1 dir2 top && git add check dir1 dir2 top foo &&
test_tick test_tick
git-commit -m initial && 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