From ae3f7218b9829ac4b7031f4a2735ab391ca69b3c Mon Sep 17 00:00:00 2001 From: Mark Rada Date: Sat, 21 Aug 2010 12:18:37 -0400 Subject: [PATCH 1/2] Tell ignore file about generate files in /gitweb/static Signed-off-by: Mark Rada Signed-off-by: Junio C Hamano --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 0eb032d86c99ac8f23435ad5ea9f2b83f1be744f Mon Sep 17 00:00:00 2001 From: Jens Lehmann Date: Wed, 18 Aug 2010 23:20:33 +0200 Subject: [PATCH 2/2] t7403: add missing &&'s Signed-off-by: Jens Lehmann Signed-off-by: Junio C Hamano --- t/t7403-submodule-sync.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 )