summaryrefslogtreecommitdiff
path: root/t/test-lib-functions.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-30 13:03:40 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-30 13:04:18 -0700
commit80ffb7570f86fb8b671048a374f3c7990c45a27f (patch)
tree0dcefafb4f8df01ccf1aaa3c345541b22d5dc1df /t/test-lib-functions.sh
parente6dfbcf12b0e70897818cb36903de0625931a5c6 (diff)
parent44b85e89d70da5ee7fc688d4a9c021f6a419b363 (diff)
downloadgit-80ffb7570f86fb8b671048a374f3c7990c45a27f.tar.gz
Merge branch 'jc/maint-filter-branch-epoch-date' into maint
In 1.7.9 era, we taught "git rebase" about the raw timestamp format but we did not teach the same trick to "filter-branch", which rolled a similar logic on its own. * jc/maint-filter-branch-epoch-date: t7003: add test to filter a branch with a commit at epoch date.c: Fix off by one error in object-header date parsing filter-branch: do not forget the '@' prefix to force git-timestamp
Diffstat (limited to 't/test-lib-functions.sh')
-rw-r--r--t/test-lib-functions.sh13
1 files changed, 11 insertions, 2 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 16397691d9..80daaca780 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -143,10 +143,19 @@ test_pause () {
# Both <file> and <contents> default to <message>.
test_commit () {
- file=${2:-"$1.t"}
+ notick= &&
+ if test "z$1" = "z--notick"
+ then
+ notick=yes
+ shift
+ fi &&
+ file=${2:-"$1.t"} &&
echo "${3-$1}" > "$file" &&
git add "$file" &&
- test_tick &&
+ if test -z "$notick"
+ then
+ test_tick
+ fi &&
git commit -m "$1" &&
git tag "$1"
}