Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t7900-subtree.sh: fix quoting and broken && chains
author
David Aguilar
<davvid@gmail.com>
Tue, 26 Jul 2016 04:14:14 +0000
(21:14 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 26 Jul 2016 20:56:57 +0000
(13:56 -0700)
Allow whitespace in arguments to subtree_test_create_repo.
Add missing && chains.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/subtree/t/t7900-subtree.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
05219a1
)
diff --git
a/contrib/subtree/t/t7900-subtree.sh
b/contrib/subtree/t/t7900-subtree.sh
index 3bf96a9bb6b29757736d8f4250fae25664e298f0..7e8be5adff4d085b31fc255687d26bc8519b78a9 100755
(executable)
--- a/
contrib/subtree/t/t7900-subtree.sh
+++ b/
contrib/subtree/t/t7900-subtree.sh
@@
-16,16
+16,16
@@
export TEST_DIRECTORY
subtree_test_create_repo()
{
subtree_test_create_repo()
{
- test_create_repo "$1"
+ test_create_repo "$1"
&&
(
(
- cd
$1
+ cd
"$1" &&
git config log.date relative
)
}
create()
{
git config log.date relative
)
}
create()
{
- echo "$1" >"$1"
+ echo "$1" >"$1"
&&
git add "$1"
}
git add "$1"
}
@@
-71,12
+71,12
@@
join_commits()
}
test_create_commit() (
}
test_create_commit() (
- repo=$1
- commit=$2
- cd "$repo"
- mkdir -p
$(dirname "$commit")
\
+ repo=$1
&&
+ commit=$2
&&
+ cd "$repo"
&&
+ mkdir -p
"$(dirname "$commit")"
\
|| error "Could not create directory for commit"
|| error "Could not create directory for commit"
- echo "$commit" >"$commit"
+ echo "$commit" >"$commit"
&&
git add "$commit" || error "Could not add commit"
git commit -m "$commit" || error "Could not commit"
)
git add "$commit" || error "Could not add commit"
git commit -m "$commit" || error "Could not commit"
)