mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
42b5f8693e
commit
43b98acc23
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue