* [PATCH 1/5] t7400: barf if git-submodule removes or replaces a file
@ 2007-06-11 0:00 Lars Hjemli
0 siblings, 0 replies; 2+ messages in thread
From: Lars Hjemli @ 2007-06-11 0:00 UTC (permalink / raw)
To: git@vger.kernel.org
The test for an unmolested file wouldn't fail properly if the file had been
removed or replaced by something other than a regular file. This fixes it.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
t/t7400-submodule-basic.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 3940433..74fafce 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -72,7 +72,7 @@ test_expect_success 'update should fail when path is used by a file' '
then
echo "[OOPS] update should have failed"
false
- elif test -f lib && test "$(cat lib)" != "hello"
+ elif test "$(cat lib)" != "hello"
then
echo "[OOPS] update failed but lib file was molested"
false
--
1.5.2.1.914.gbd3a7
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 0/5] misc. submodule related changes
@ 2007-06-11 19:12 Lars Hjemli
2007-06-11 19:12 ` [PATCH 1/5] t7400: barf if git-submodule removes or replaces a file Lars Hjemli
0 siblings, 1 reply; 2+ messages in thread
From: Lars Hjemli @ 2007-06-11 19:12 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Here is a reworked patch-series for git-submodule, trying to cater for
the issues with the previous series.
Shortlog:
[1/5] t7400: barf if git-submodule removes or replaces a file
[2/5] git-submodule: remember to checkout after clone
[3/5] Rename sections from "module" to "submodule" in .gitmodules
[4/5] git-submodule: give submodules proper names
[5/5] Add gitmodules(5)
Diffstat:
Documentation/Makefile | 2 +-
Documentation/gitmodules.txt | 63 ++++++++++++++++++++++++++++++++++++++++++
git-submodule.sh | 52 +++++++++++++++++++++++-----------
t/t7400-submodule-basic.sh | 22 +++++++++++---
4 files changed, 116 insertions(+), 23 deletions(-)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 1/5] t7400: barf if git-submodule removes or replaces a file
2007-06-11 19:12 [PATCH 0/5] misc. submodule related changes Lars Hjemli
@ 2007-06-11 19:12 ` Lars Hjemli
0 siblings, 0 replies; 2+ messages in thread
From: Lars Hjemli @ 2007-06-11 19:12 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
The test for an unmolested file wouldn't fail properly if the file had been
removed or replaced by something other than a regular file. This fixes it.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
t/t7400-submodule-basic.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 3940433..74fafce 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -72,7 +72,7 @@ test_expect_success 'update should fail when path is used by a file' '
then
echo "[OOPS] update should have failed"
false
- elif test -f lib && test "$(cat lib)" != "hello"
+ elif test "$(cat lib)" != "hello"
then
echo "[OOPS] update failed but lib file was molested"
false
--
1.5.2.1.914.gbd3a7
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-06-11 19:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-06-11 0:00 [PATCH 1/5] t7400: barf if git-submodule removes or replaces a file Lars Hjemli
-- strict thread matches above, loose matches on Subject: below --
2007-06-11 19:12 [PATCH 0/5] misc. submodule related changes Lars Hjemli
2007-06-11 19:12 ` [PATCH 1/5] t7400: barf if git-submodule removes or replaces a file Lars Hjemli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).