No subject


Thu Jun 12 23:09:36 BST 2008 

Updating 1226c2e..1548ecd
Fast forward
 mainfile    |    1 +
 sub         |    1 -
 2 files changed, 1 insertions(+), 1 deletions(-)
 delete mode 160000 sub
 create mode 100644 sub/subfile
*   ok 4: fetch

* passed all 4 test(s)
*** t3060-ls-files-with-tree.sh ***
* expecting success: 

	# The bug we are exercising requires a fair number of entries
	# in a sub-directory so that add_index_entry will trigger a
	# realloc.

	echo file >expected &&
	mkdir sub &&
	bad= &&
	for n in 0 1 2 3 4 5
	do
		for m in 0 1 2 3 4 5 6 7 8 9
		do
			num=00$n$m &&
			>sub/file-$num &&
			echo file-$num >>expected || {
				bad=t
				break
			}
		done && test -z "$bad" || {
			bad=t
			break
		}
	done && test -z "$bad" &&
	git add . &&
	git commit -m "add a bunch of files" &&

	# We remove them all so that we will have something to add
	# back with --with-tree and so that we will definitely be
	# under the realloc size to trigger the bug.
	rm -rf sub &&
	git commit -a -m "remove them all" &&

	# The bug also requires some entry before our directory so that
	# prune_path will modify the_index.cache

	mkdir a_directory_that_sorts_before_sub &&
	>a_directory_that_sorts_before_sub/file &&
	mkdir sub &&
	>sub/file &&
	git add .

Created initial commit c00580c: add a bunch of files
 1 files changed, 61 insertions(+), 0 deletions(-)
 create mode 100644 expected
 create mode 100644 sub/file-0000
 create mode 100644 sub/file-0001
 create mode 100644 sub/file-0002
 create mode 100644 sub/file-0003
 create mode 100644 sub/file-0004
 create mode 100644 sub/file-0005
 create mode 100644 sub/file-0006
 create mode 100644 sub/file-0007
 create mode 100644 sub/file-0008
 create mode 100644 sub/file-0009
 create mode 100644 sub/file-0010
 create mode 100644 sub/file-0011
 create mode 100644 sub/file-0012
 create mode 100644 sub/file-0013
 create mode 100644 sub/file-0014
 create mode 100644 sub/file-0015
 create mode 100644 sub/file-0016
 create mode 100644 sub/file-0017
 create mode 100644 sub/file-0018
 create mode 100644 sub/file-0019
 create mode 100644 sub/file-0020
 create mode 100644 sub/file-0021
 create mode 100644 sub/file-0022
 create mode 100644 sub/file-0023
 create mode 100644 sub/file-0024
 create mode 100644 sub/file-0025
 create mode 100644 sub/file-0026
 create mode 100644 sub/file-0027
 create mode 100644 sub/file-0028
 create mode 100644 sub/file-0029
 create mode 100644 sub/file-0030
 create mode 100644 sub/file-0031
 create mode 100644 sub/file-0032
 create mode 100644 sub/file-0033
 create mode 100644 sub/file-0034
 create mode 100644 sub/file-0035
 create mode 100644 sub/file-0036
 create mode 100644 sub/file-0037
 create mode 100644 sub/file-0038
 create mode 100644 sub/file-0039
 create mode 100644 sub/file-0040
 create mode 100644 sub/file-0041
 create mode 100644 sub/file-0042
 create mode 100644 sub/file-0043
 create mode 100644 sub/file-0044
 create mode 100644 sub/file-0045
 create mode 100644 sub/file-0046
 create mode 100644 sub/file-0047
 create mode 100644 sub/file-0048
 create mode 100644 sub/file-0049
 create mode 100644 sub/file-0050
 create mode 100644 sub/file-0051
 create mode 100644 sub/file-0052
 create mode 100644 sub/file-0053
 create mode 100644 sub/file-0054
 create mode 100644 sub/file-0055
 create mode 100644 sub/file-0056
 create mode 100644 sub/file-0057
 create mode 100644 sub/file-0058
 create mode 100644 sub/file-0059
Created commit f8411d1: remove them all
 0 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 sub/file-0000
 delete mode 100644 sub/file-0001
 delete mode 100644 sub/file-0002
 delete mode 100644 sub/file-0003
 delete mode 100644 sub/file-0004
 delete mode 100644 sub/file-0005
 delete mode 100644 sub/file-0006
 delete mode 100644 sub/file-0007
 delete mode 100644 sub/file-0008
 delete mode 100644 sub/file-0009
 delete mode 100644 sub/file-0010
 delete mode 100644 sub/file-0011
 delete mode 100644 sub/file-0012
 delete mode 100644 sub/file-0013
 delete mode 100644 sub/file-0014
 delete mode 100644 sub/file-0015
 delete mode 100644 sub/file-0016
 delete mode 100644 sub/file-0017
 delete mode 100644 sub/file-0018
 delete mode 100644 sub/file-0019
 delete mode 100644 sub/file-0020
 delete mode 100644 sub/file-0021
 delete mode 100644 sub/file-0022
 delete mode 100644 sub/file-0023
 delete mode 100644 sub/file-0024
 delete mode 100644 sub/file-0025
 delete mode 100644 sub/file-0026
 delete mode 100644 sub/file-0027
 delete mode 100644 sub/file-0028
 delete mode 100644 sub/file-0029
 delete mode 100644 sub/file-0030
 delete mode 100644 sub/file-0031
 delete mode 100644 sub/file-0032
 delete mode 100644 sub/file-0033
 delete mode 100644 sub/file-0034
 delete mode 100644 sub/file-0035
 delete mode 100644 sub/file-0036
 delete mode 100644 sub/file-0037
 delete mode 100644 sub/file-0038
 delete mode 100644 sub/file-0039
 delete mode 100644 sub/file-0040
 delete mode 100644 sub/file-0041
 delete mode 100644 sub/file-0042
 delete mode 100644 sub/file-0043
 delete mode 100644 sub/file-0044
 delete mode 100644 sub/file-0045
 delete mode 100644 sub/file-0046
 delete mode 100644 sub/file-0047
 delete mode 100644 sub/file-0048
 delete mode 100644 sub/file-0049
 delete mode 100644 sub/file-0050
 delete mode 100644 sub/file-0051
 delete mode 100644 sub/file-0052
 delete mode 100644 sub/file-0053
 delete mode 100644 sub/file-0054
 delete mode 100644 sub/file-0055
 delete mode 100644 sub/file-0056
 delete mode 100644 sub/file-0057
 delete mode 100644 sub/file-0058
 delete mode 100644 sub/file-0059
*   ok 1: setup

* expecting success: 

	git ls-files --with-tree=HEAD~1 >../output


*   ok 2: git -ls-files --with-tree should succeed from subdir

* expecting success: diff -u expected output
*   ok 3: git -ls-files --with-tree should add entries from named tree.

* passed all 3 test(s)
*** t3100-ls-tree-restrict.sh ***
* expecting success: mkdir path2 path2/baz &&
     echo Hi >path0 &&
     ln -s path0 path1 &&
     echo Lo >path2/foo &&
     ln -s ../path1 path2/bazbo &&
     echo Mi >path2/baz/b &&
     find path? \( -type f -o -type l \) -print |
     xargs git update-index --add &&
     tree=`git write-tree` &&
     echo $tree
a384d4f8dd786f29d6da4705dee4c2c0bc6b5049
*   ok 1: setup

* expecting success: git ls-tree $tree >current &&
     cat >expected <<\EOF &&
100644 blob X	path0
120000 blob X	path1
040000 tree X	path2
EOF
     test_output
*   ok 2: ls-tree plain

* expecting success: git ls-tree -r $tree >current &&
     cat >expected <<\EOF &&
100644 blob X	path0
120000 blob X	path1
100644 blob X	path2/baz/b
120000 blob X	path2/bazbo
100644 blob X	path2/foo
EOF
     test_output
*   ok 3: ls-tree recursive

* expecting success: git ls-tree -r -t $tree >current &&
     cat >expected <<\EOF &&
100644 blob X	path0
120000 blob X	path1
040000 tree X	path2
040000 tree X	path2/baz
100644 blob X	path2/baz/b
120000 blob X	path2/bazbo
100644 blob X	path2/foo
EOF
     test_output
*   ok 4: ls-tree recursive with -t

* expecting success: git ls-tree -r -d $tree >current &&
     cat >expected <<\EOF &&
040000 tree X	path2
040000 tree X	path2/baz
EOF
     test_output
*   ok 5: ls-tree recursive with -d

* expecting success: git ls-tree $tree path >current &&
     cat >expected <<\EOF &&
EOF
     test_output
*   ok 6: ls-tree filtered with path

* expecting success: git ls-tree $tree path1 path0 >current &&
     cat >expected <<\EOF &&
100644 blob X	path0
120000 blob X	path1
EOF
     test_output
*   ok 7: ls-tree filtered with path1 path0

* expecting success: git ls-tree $tree path0/ >current &&
     cat >expected <<\EOF &&
EOF
     test_output
*   ok 8: ls-tree filtered with path0/

* expecting success: git ls-tree $tree path2 >current &&
     cat >expected <<\EOF &&
040000 tree X	path2
EOF
     test_output
*   ok 9: ls-tree filtered with path2

* expecting success: git ls-tree $tree path2/ >current &&
     cat >expected <<\EOF &&
040000 tree X	path2/baz
120000 blob X	path2/bazbo
100644 blob X	path2/foo
EOF
     test_output
*   ok 10: ls-tree filtered with path2/

* expecting success: git ls-tree $tree path2/baz >current &&
     cat >expected <<\EOF &&
040000 tree X	path2/baz
EOF
     test_output
*   ok 11: ls-tree filtered with path2/baz

* expecting success: git ls-tree $tree path2/bak >current &&
     cat >expected <<\EOF &&
EOF
     test_output
*   ok 12: ls-tree filtered with path2/bak

* expecting success: git ls-tree -t $tree path2/bak >current &&
     cat >expected <<\EOF &&
040000 tree X	path2
EOF
     test_output
*   ok 13: ls-tree -t filtered with path2/bak

* passed all 13 test(s)
*** t3101-ls-tree-dirname.sh ***
* expecting success: echo 111 >1.txt &&
     echo 222 >2.txt &&
     mkdir path0 path0/a path0/a/b path0/a/b/c &&
     echo 111 >path0/a/b/c/1.txt &&
     mkdir path1 path1/b path1/b/c &&
     echo 111 >path1/b/c/1.txt &&
     mkdir path2 &&
     echo 111 >path2/1.txt &&
     mkdir path3 &&
     echo 111 >path3/1.txt &&
     echo 222 >path3/2.txt &&
     find *.txt path* \( -type f -o -type l \) -print |
     xargs git update-index --add &&
     tree=`git write-tree` &&
     echo $tree
ef2ea4d6de8ec0863f430e4cad7468ce74f60aa7
*   ok 1: setup

* expecting success: git ls-tree $tree >current &&
     cat >expected <<\EOF &&
100644 blob X	1.txt
100644 blob X	2.txt
040000 tree X	path0
040000 tree X	path1
040000 tree X	path2
040000 tree X	path3
EOF
     test_output
*   ok 2: ls-tree plain

* expecting success: git ls-tree -r $tree >current &&
     cat >expected <<\EOF &&
100644 blob X	1.txt
100644 blob X	2.txt
100644 blob X	path0/a/b/c/1.txt
100644 blob X	path1/b/c/1.txt
100644 blob X	path2/1.txt
100644 blob X	path3/1.txt
100644 blob X	path3/2.txt
EOF
     test_output
*   ok 3: ls-tree recursive

* expecting success: git ls-tree $tree 1.txt >current &&
     cat >expected <<\EOF &&
100644 blob X	1.txt
EOF
     test_output
*   ok 4: ls-tree filter 1.txt

* expecting success: git ls-tree $tree path1/b/c/1.txt >current &&
     cat >expected <<\EOF &&
100644 blob X	path1/b/c/1.txt
EOF
     test_output
*   ok 5: ls-tree filter path1/b/c/1.txt

* expecting success: git ls-tree $tree 1.txt path0/a/b/c/1.txt path1/b/c/1.txt path2/1.txt path3/1.txt >current &&
     cat >expected <<\EOF &&
100644 blob X	1.txt
100644 blob X	path0/a/b/c/1.txt
100644 blob X	path1/b/c/1.txt
100644 blob X	path2/1.txt
100644 blob X	path3/1.txt
EOF
     test_output
*   ok 6: ls-tree filter all 1.txt files

* expecting success: git ls-tree $tree path3 path2 path0/a/b/c path1/b/c path0/a >current &&
     cat >expected <<\EOF &&
040000 tree X	path0/a/b/c
040000 tree X	path1/b/c
040000 tree X	path2
040000 tree X	path3
EOF
     test_output
*   ok 7: ls-tree filter directories

* expecting success: git ls-tree $tree 1.txt /1.txt //1.txt path3/1.txt /path3/1.txt //path3//1.txt path3 /path3/ path3// >current &&
     cat >expected <<\EOF &&
100644 blob X	1.txt
100644 blob X	path3/1.txt
100644 blob X	path3/2.txt
EOF
     test_output
*   ok 8: ls-tree filter odd names

* expecting success: git ls-tree $tree 1.txt/ abc.txt path3//23.txt path3/2.txt/// >current &&
     cat >expected <<\EOF &&
EOF
     test_output
*   ok 9: ls-tree filter missing files and extra slashes

* passed all 9 test(s)
*** t3200-branch.sh ***
* expecting success: echo Hello > A &&
     git update-index --add A &&
     git-commit -m "Initial commit." &&
     HEAD=$(git rev-parse --verify HEAD)
Created initial commit e3e9b37: Initial commit.
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 A
*   ok 1: prepare a trivial repository

* expecting failure: git branch --help </dev/null >/dev/null 2>/dev/null || :
     test -f .git/refs/heads/--help
*   ok 2: git branch --help should not have created a bogus branch

* expecting success: git branch abc && test -f .git/refs/heads/abc
*   ok 3: git branch abc should create a branch

* expecting success: git branch a/b/c && test -f .git/refs/heads/a/b/c
*   ok 4: git branch a/b/c should create a branch

* expecting success: GIT_COMMITTER_DATE="2005-05-26 23:30" \
     git branch -l d/e/f &&
	 test -f .git/refs/heads/d/e/f &&
	 test -f .git/logs/refs/heads/d/e/f &&
	 diff expect .git/logs/refs/heads/d/e/f
*   ok 5: git branch -l d/e/f should create a branch and a log

* expecting success: git branch -d d/e/f &&
	 test ! -f .git/refs/heads/d/e/f &&
	 test ! -f .git/logs/refs/heads/d/e/f
Deleted branch d/e/f.
*   ok 6: git branch -d d/e/f should delete a branch and a log

* expecting success: git branch j &&
        git branch -d j &&
        git branch j/k
Deleted branch j.
*   ok 7: git branch j/k should work after branch j has been deleted

* expecting success: git branch l/m &&
        git branch -d l/m &&
        git branch l
Deleted branch l/m.
*   ok 8: git branch l should work after branch l/m has been deleted

* expecting success: git branch -l m &&
        git branch -m m m/m &&
        test -f .git/logs/refs/heads/m/m
*   ok 9: git branch -m m m/m should work

* expecting success: git branch -l n/n &&
        git branch -m n/n n
        test -f .git/logs/refs/heads/n
*   ok 10: git branch -m n/n n should work

* expecting failure: git branch o/o &&
        git branch o/p &&
        git branch -m o/o o
error: 'refs/heads/o/p' exists; cannot create 'refs/heads/o'
fatal: Branch rename failed
*   ok 11: git branch -m o/o o should fail when o/p exists

* expecting failure: git branch q &&
         git branch r &&
         git branch -m q r/q
error: 'refs/heads/r' exists; cannot create 'refs/heads/r/q'
fatal: Branch rename failed
*   ok 12: git branch -m q r/q should fail when r exists

* expecting success: 
	git branch -m q q2 &&
	git branch -m q2 q

*   ok 13: git branch -m q q2 without config should succeed

* expecting success: git branch -l s/s &&
        test -f .git/logs/refs/heads/s/s &&
        git branch -l s/t &&
        test -f .git/logs/refs/heads/s/t &&
        git branch -d s/t &&
        git branch -m s/s s &&
        test -f .git/logs/refs/heads/s
Deleted branch s/t.
*   ok 14: git branch -m s/s s should work when s/t is deleted

* expecting success: test Hello = Hello &&
	 ! git config branch.s/s/dummy
*   ok 15: config information was renamed, too

* expecting failure: git branch -l u &&
     mv .git/logs/refs/heads/u real-u &&
     ln -s real-u .git/logs/refs/heads/u &&
     git branch -m u v
error: reflog for refs/heads/u is a symlink
fatal: Branch rename failed
*   ok 16: git branch -m u v should fail when the reflog for u is a symlink

* expecting success: git config remote.local.url . &&
     git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
     (git show-ref -q refs/remotes/local/master || git-fetch local) &&
     git branch --track my1 local/master &&
     test $(git config branch.my1.remote) = local &&
     test $(git config branch.my1.merge) = refs/heads/master

More information about the ubuntu-autotest mailing list