undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  t7403: add missing &&'s
  Tell ignore file about generate files in /gitweb/static
This commit is contained in:
Junio C Hamano 2010-08-21 23:16:32 -07:00
commit c307fbfdc4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -158,7 +158,7 @@
/gitk-git/gitk-wish
/gitweb/GITWEB-BUILD-OPTIONS
/gitweb/gitweb.cgi
/gitweb/gitweb.min.*
/gitweb/static/gitweb.min.*
/test-chmtime
/test-ctype
/test-date

4
t/t7403-submodule-sync.sh
View File

@ -14,7 +14,7 @@ test_expect_success setup '
echo file > file &&
git add file &&
test_tick &&
git commit -m upstream
git commit -m upstream &&
git clone . super &&
git clone super submodule &&
(cd super &&
@ -42,7 +42,7 @@ test_expect_success 'change submodule url' '
) &&
mv submodule moved-submodule &&
(cd super &&
git config -f .gitmodules submodule.submodule.url ../moved-submodule
git config -f .gitmodules submodule.submodule.url ../moved-submodule &&
test_tick &&
git commit -a -m moved-submodule
)