diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-24 07:08:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-24 07:08:16 (GMT) |
| commit | 520d7e278cfd25057e883575060b7378dfab61dc (patch) | |
| tree | 3f20d1056ba4a3e1de652e25d32f2736395a8e2b /t | |
| parent | afb5f39e24eadc5933b34cfd17c1089e482d6a6b (diff) | |
| parent | 41728d69426dd707d4978929f8f4ac7a16f115f3 (diff) | |
| download | git-520d7e278cfd25057e883575060b7378dfab61dc.zip git-520d7e278cfd25057e883575060b7378dfab61dc.tar.gz git-520d7e278cfd25057e883575060b7378dfab61dc.tar.bz2 | |
Merge branch 'maint'
* maint:
Documentation/git-reset.txt: suggest git commit --amend in example.
Build RPM with ETC_GITCONFIG=/etc/gitconfig
Ignore all man sections as they are generated files.
Fix typo in git-am: s/Was is/Was it/
Reverse the order of -b and --track in the man page.
dir.c(common_prefix): Fix two bugs
Conflicts:
git.spec.in
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3700-add.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t3700-add.sh b/t/t3700-add.sh index 08e0352..ad8cc7d 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -104,4 +104,10 @@ test_expect_success 'add ignored ones with -f' ' git-ls-files --error-unmatch d.ig/d.if d.ig/d.ig ' +mkdir 1 1/2 1/3 +touch 1/2/a 1/3/b 1/2/c +test_expect_success 'check correct prefix detection' ' + git add 1/2/a 1/3/b 1/2/c +' + test_done |