diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-04-24 00:08:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-24 00:08:16 -0700 |
| commit | 520d7e278cfd25057e883575060b7378dfab61dc (patch) | |
| tree | 3f20d1056ba4a3e1de652e25d32f2736395a8e2b /t | |
| parent | git-fetch: Fix "argument list too long" (diff) | |
| parent | Documentation/git-reset.txt: suggest git commit --amend in example. (diff) | |
| download | tgif-520d7e278cfd25057e883575060b7378dfab61dc.tar.xz | |
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 08e035220c..ad8cc7d4ae 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 |