Merge branch 'jc/maint-add-sync-stat'

* jc/maint-add-sync-stat:
  t2200: test more cases of "add -u"
  git-add: make the entry stat-clean after re-adding the same contents
  ce_match_stat, run_diff_files: use symbolic constants for readability

Conflicts:

	builtin-add.c
This commit is contained in:
Junio C Hamano
2007-11-14 14:15:40 -08:00
10 changed files with 92 additions and 38 deletions

View File

@ -1,6 +1,6 @@
#!/bin/sh
test_description='git add -u with path limiting
test_description='git add -u
This test creates a working tree state with three files:
@ -9,7 +9,10 @@ This test creates a working tree state with three files:
dir/other (untracked)
and issues a git add -u with path limiting on "dir" to add
only the updates to dir/sub.'
only the updates to dir/sub.
Also tested are "git add -u" without limiting, and "git add -u"
without contents changes.'
. ./test-lib.sh
@ -85,4 +88,27 @@ test_expect_success 'replace a file with a symlink' '
'
test_expect_success 'add everything changed' '
git add -u &&
test -z "$(git diff-files)"
'
test_expect_success 'touch and then add -u' '
touch check &&
git add -u &&
test -z "$(git diff-files)"
'
test_expect_success 'touch and then add explicitly' '
touch check &&
git add check &&
test -z "$(git diff-files)"
'
test_done