diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-10-17 03:32:03 (GMT) |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-17 03:32:03 (GMT) |
| commit | 317efa63fc457d1a726902ddf97298c201df627c (patch) | |
| tree | d4f38c3fd8ec2a422c4db76e00b784f760540f1f /t | |
| parent | 54f0db79ca11d08a448e45cfcb6e4304c6d16014 (diff) | |
| parent | 09955207d148c5f3964002b7f3a4e13db3050777 (diff) | |
| download | git-317efa63fc457d1a726902ddf97298c201df627c.zip git-317efa63fc457d1a726902ddf97298c201df627c.tar.gz git-317efa63fc457d1a726902ddf97298c201df627c.tar.bz2 | |
Merge branch 'maint'
* maint:
Document additional 1.5.3.5 fixes in release notes
Avoid 'expr index' on Mac OS X as it isn't supported
filter-branch: update current branch when rewritten
fix filter-branch documentation
helpful error message when send-pack finds no refs in common.
Fix setup_git_directory_gently() with relative GIT_DIR & GIT_WORK_TREE
Correct typos in release notes for 1.5.3.5
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1501-worktree.sh | 9 | ||||
| -rwxr-xr-x | t/t7003-filter-branch.sh | 4 |
2 files changed, 12 insertions, 1 deletions
diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh index 7322161..7ee3820 100755 --- a/t/t1501-worktree.sh +++ b/t/t1501-worktree.sh @@ -103,4 +103,13 @@ test_expect_success 'repo finds its work tree from work tree, too' ' test sub/dir/tracked = "$(git ls-files)") ' +test_expect_success '_gently() groks relative GIT_DIR & GIT_WORK_TREE' ' + cd repo.git/work/sub/dir && + GIT_DIR=../../.. GIT_WORK_TREE=../.. GIT_PAGER= \ + git diff --exit-code tracked && + echo changed > tracked && + ! GIT_DIR=../../.. GIT_WORK_TREE=../.. GIT_PAGER= \ + git diff --exit-code tracked +' + test_done diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index e935b20..2089351 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -41,7 +41,9 @@ test_expect_success 'rewrite, renaming a specific file' ' ' test_expect_success 'test that the file was renamed' ' - test d = $(git show HEAD:doh) + test d = $(git show HEAD:doh) && + test -f doh && + test d = $(cat doh) ' git tag oldD HEAD~4 |