aboutsummaryrefslogtreecommitdiff
path: root/t/test-lib-functions.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-22 12:54:08 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-22 12:55:05 -0700
commit9a0231b395cb9720365b7066312eeaa86e37ed31 (patch)
treec0bbb57aeb5653275e237f72f1da25599e29056c /t/test-lib-functions.sh
parent31c79549b85c6393be4f40432f5b86ebc097fc7e (diff)
parent44b85e89d70da5ee7fc688d4a9c021f6a419b363 (diff)
downloadgit-9a0231b395cb9720365b7066312eeaa86e37ed31.tar.gz
git-9a0231b395cb9720365b7066312eeaa86e37ed31.tar.xz
Merge branch 'jc/maint-filter-branch-epoch-date'
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. Because of this, "filter-branch" failed to rewrite commits with ancient timestamps. * 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 16397691d..80daaca78 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"
}