diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:16:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:16:32 -0700 |
| commit | c307fbfdc403a59dc33209677a02bb5e88487185 (patch) | |
| tree | e2afe62da00ad772b134bb62f99fc3ac937dc3cf | |
| parent | f9c33605700e37b75279ed6ce4bffaad3eb0cf10 (diff) | |
| parent | 0eb032d86c99ac8f23435ad5ea9f2b83f1be744f (diff) | |
| download | git-c307fbfdc403a59dc33209677a02bb5e88487185.tar.gz | |
Merge branch 'maint'
* maint:
t7403: add missing &&'s
Tell ignore file about generate files in /gitweb/static
| -rw-r--r-- | .gitignore | 2 | ||||
| -rwxr-xr-x | t/t7403-submodule-sync.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 14e2b6bde9..fcdd822d8a 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh index 7538756487..bade2179b1 100755 --- a/t/t7403-submodule-sync.sh +++ b/t/t7403-submodule-sync.sh @@ -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 ) |