Skip to main content

Browse the archive

Revision 80ffb7570f86fb8b671048a374f3c7990c45a27f authored by Junio C Hamano on 30 July 2012, 20:03:40 UTC, committed by Junio C Hamano on 30 July 2012, 20:04:18 UTC 
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
2 parent s e6dfbcf + 44b85e8
Raw File
t7101-reset.sh 
#!/bin/sh
#
# Copyright (c) 2006 Shawn Pearce
#

test_description='git reset should cull empty subdirs'
. ./test-lib.sh

test_expect_success \
    'creating initial files' \
    'mkdir path0 &&
     cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
     git add path0/COPYING &&
     git commit -m add -a'

test_expect_success \
    'creating second files' \
    'mkdir path1 &&
     mkdir path1/path2 &&
     cp "$TEST_DIRECTORY"/../COPYING path1/path2/COPYING &&
     cp "$TEST_DIRECTORY"/../COPYING path1/COPYING &&
     cp "$TEST_DIRECTORY"/../COPYING COPYING &&
     cp "$TEST_DIRECTORY"/../COPYING path0/COPYING-TOO &&
     git add path1/path2/COPYING &&
     git add path1/COPYING &&
     git add COPYING &&
     git add path0/COPYING-TOO &&
     git commit -m change -a'

test_expect_success \
    'resetting tree HEAD^' \
    'git reset --hard HEAD^'

test_expect_success \
    'checking initial files exist after rewind' \
    'test -d path0 &&
     test -f path0/COPYING'

test_expect_success \
    'checking lack of path1/path2/COPYING' \
    '! test -f path1/path2/COPYING'

test_expect_success \
    'checking lack of path1/COPYING' \
    '! test -f path1/COPYING'

test_expect_success \
    'checking lack of COPYING' \
    '! test -f COPYING'

test_expect_success \
    'checking checking lack of path1/COPYING-TOO' \
    '! test -f path0/COPYING-TOO'

test_expect_success \
    'checking lack of path1/path2' \
    '! test -d path1/path2'

test_expect_success \
    'checking lack of path1' \
    '! test -d path1'

test_done
back to top