components/git/test/results-64.master
author Craig Mohrman <craig.mohrman@oracle.com>
Fri, 03 Apr 2015 10:20:02 -0700
changeset 4050 253de46fd78c
child 4944 2efba29a3b65
permissions -rw-r--r--
20761309 problem in UTILITY/GIT 20460364 GIT should have some master test results to compare against
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4050
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     1
make[1]: Entering directory `$(@D)'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     2
    SUBDIR gitweb
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     3
    SUBDIR ../
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     4
make[3]: `GIT-VERSION-FILE' is up to date.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     5
    GEN git-instaweb
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     6
    SUBDIR git-gui
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     7
    SUBDIR gitk-git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     8
make[2]: Nothing to be done for `all'.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
     9
    SUBDIR perl
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    10
mkdir -p blib/lib
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    11
rm -f blib/lib/Git.pm; cp Git.pm blib/lib/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    12
rm -f blib/lib/Error.pm
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    13
cp private-Error.pm blib/lib/Error.pm
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    14
    SUBDIR git_remote_helpers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    15
    SUBDIR templates
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    16
/usr/gnu/bin/make -C t/ all
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    17
make[2]: Entering directory `$(@D)/t'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    18
rm -f -r test-results
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    19
/usr/gnu/bin/make aggregate-results-and-cleanup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    20
make[3]: Entering directory `$(@D)/t'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    21
*** t0000-basic.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    22
ok 1 - .git/objects should be empty after git init in an empty repo.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    23
ok 2 - .git/objects should have 3 subdirectories.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    24
ok 3 - success is reported like this
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    25
not ok 4 - pretend we have a known breakage # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    26
ok 5 - pretend we have fixed a known breakage (run in sub test-lib)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    27
ok 6 - test runs if prerequisite is satisfied
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    28
ok 7 # skip unmet prerequisite causes test to be skipped (missing DONTHAVEIT)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    29
ok 8 - test runs if prerequisites are satisfied
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    30
ok 9 # skip unmet prerequisites causes test to be skipped (missing DONTHAVEIT of HAVEIT,DONTHAVEIT)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    31
ok 10 # skip unmet prerequisites causes test to be skipped (missing DONTHAVEIT of DONTHAVEIT,HAVEIT)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    32
ok 11 - tests clean up after themselves
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    33
ok 12 - tests clean up even on failures
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    34
ok 13 - git update-index without --add should fail adding.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    35
ok 14 - git update-index with --add should succeed.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    36
ok 15 - writing tree out with git write-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    37
ok 16 - validate object ID of a known tree.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    38
ok 17 - git update-index without --remove should fail removing.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    39
ok 18 - git update-index with --remove should be able to remove.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    40
ok 19 - git write-tree should be able to write an empty tree.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    41
ok 20 - validate object ID of a known tree.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    42
ok 21 - adding various types of objects with git update-index --add.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    43
ok 22 - showing stage with git ls-files --stage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    44
ok 23 - validate git ls-files output for a known tree.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    45
ok 24 - writing tree out with git write-tree.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    46
ok 25 - validate object ID for a known tree.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    47
ok 26 - showing tree with git ls-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    48
ok 27 - git ls-tree output for a known tree.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    49
ok 28 - showing tree with git ls-tree -r
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    50
ok 29 - git ls-tree -r output for a known tree.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    51
ok 30 - showing tree with git ls-tree -r -t
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    52
ok 31 - git ls-tree -r output for a known tree.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    53
ok 32 - writing partial tree out with git write-tree --prefix.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    54
ok 33 - validate object ID for a known tree.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    55
ok 34 - writing partial tree out with git write-tree --prefix.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    56
ok 35 - validate object ID for a known tree.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    57
ok 36 - put invalid objects into the index.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    58
ok 37 - writing this tree without --missing-ok.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    59
ok 38 - writing this tree with --missing-ok.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    60
ok 39 - git read-tree followed by write-tree should be idempotent.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    61
ok 40 - validate git diff-files output for a know cache/work tree state.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    62
ok 41 - git update-index --refresh should succeed.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    63
ok 42 - no diff after checkout and git update-index --refresh.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    64
ok 43 - git commit-tree records the correct tree in a commit.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    65
ok 44 - git commit-tree records the correct parent in a commit.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    66
ok 45 - git commit-tree omits duplicated parent in a commit.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    67
ok 46 - update-index D/F conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    68
ok 47 - real path works as expected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    69
ok 48 - very long name in the index handled sanely
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    70
# still have 1 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    71
# passed all remaining 47 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    72
1..48
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    73
*** t0001-init.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    74
ok 1 - plain
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    75
ok 2 - plain nested in bare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    76
ok 3 - plain through aliased command, outside any git repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    77
not ok 4 - plain nested through aliased command # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    78
not ok 5 - plain nested in bare through aliased command # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    79
ok 6 - plain with GIT_WORK_TREE
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    80
ok 7 - plain bare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    81
ok 8 - plain bare with GIT_WORK_TREE
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    82
ok 9 - GIT_DIR bare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    83
ok 10 - init --bare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    84
ok 11 - GIT_DIR non-bare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    85
ok 12 - GIT_DIR & GIT_WORK_TREE (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    86
ok 13 - GIT_DIR & GIT_WORK_TREE (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    87
ok 14 - reinit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    88
ok 15 - init with --template
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    89
ok 16 - init with --template (blank)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    90
ok 17 - init with init.templatedir set
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    91
ok 18 - init --bare/--shared overrides system/global config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    92
ok 19 - init honors global core.sharedRepository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    93
ok 20 - init rejects insanely long --template
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    94
ok 21 - init creates a new directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    95
ok 22 - init creates a new bare directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    96
ok 23 - init recreates a directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    97
ok 24 - init recreates a new bare directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    98
ok 25 - init creates a new deep directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
    99
ok 26 - init creates a new deep directory (umask vs. shared)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   100
ok 27 - init notices EEXIST (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   101
ok 28 - init notices EEXIST (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   102
ok 29 - init notices EPERM
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   103
ok 30 - init creates a new bare directory with global --bare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   104
ok 31 - init prefers command line to GIT_DIR
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   105
ok 32 - init with separate gitdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   106
ok 33 - re-init to update git link
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   107
ok 34 - re-init to move gitdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   108
ok 35 - re-init to move gitdir symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   109
# still have 2 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   110
# passed all remaining 33 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   111
1..35
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   112
*** t0002-gitfile.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   113
ok 1 - initial setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   114
ok 2 - bad setup: invalid .git file format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   115
ok 3 - bad setup: invalid .git file path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   116
ok 4 - final setup + check rev-parse --git-dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   117
ok 5 - check hash-object
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   118
ok 6 - check cat-file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   119
ok 7 - check update-index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   120
ok 8 - check write-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   121
ok 9 - check commit-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   122
ok 10 - check rev-list
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   123
# passed all 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   124
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   125
*** t0003-attributes.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   126
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   127
ok 2 - command line checks
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   128
ok 3 - attribute test
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   129
ok 4 - attribute matching is case sensitive when core.ignorecase=0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   130
ok 5 - attribute matching is case insensitive when core.ignorecase=1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   131
ok 6 - check whether FS is case-insensitive
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   132
ok 7 # skip additional case insensitivity tests (missing CASE_INSENSITIVE_FS)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   133
ok 8 - unnormalized paths
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   134
ok 9 - relative paths
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   135
ok 10 - prefixes are not confused with leading directories
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   136
ok 11 - core.attributesfile
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   137
ok 12 - attribute test: read paths from stdin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   138
ok 13 - attribute test: --all option
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   139
ok 14 - attribute test: --cached option
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   140
ok 15 - root subdir attribute test
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   141
ok 16 - setup bare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   142
ok 17 - bare repository: check that .gitattribute is ignored
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   143
ok 18 - bare repository: check that --cached honors index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   144
ok 19 - bare repository: test info/attributes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   145
# passed all 19 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   146
1..19
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   147
*** t0004-unwritable.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   148
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   149
ok 2 - write-tree should notice unwritable repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   150
ok 3 - commit should notice unwritable repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   151
ok 4 - update-index should notice unwritable repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   152
ok 5 - add should notice unwritable repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   153
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   154
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   155
*** t0005-signals.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   156
ok 1 - sigchain works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   157
# passed all 1 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   158
1..1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   159
*** t0006-date.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   160
ok 1 - relative date (5 seconds ago)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   161
ok 2 - relative date (5 minutes ago)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   162
ok 3 - relative date (5 hours ago)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   163
ok 4 - relative date (5 days ago)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   164
ok 5 - relative date (3 weeks ago)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   165
ok 6 - relative date (5 months ago)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   166
ok 7 - relative date (1 year, 2 months ago)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   167
ok 8 - relative date (1 year, 9 months ago)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   168
ok 9 - relative date (20 years ago)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   169
ok 10 - relative date (12 months ago)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   170
ok 11 - relative date (2 years ago)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   171
ok 12 - parse date (2008)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   172
ok 13 - parse date (2008-02)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   173
ok 14 - parse date (2008-02-14)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   174
ok 15 - parse date (2008-02-14 20:30:45)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   175
ok 16 - parse date (2008-02-14 20:30:45 -0500)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   176
ok 17 - parse date (2008-02-14 20:30:45 -0015)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   177
ok 18 - parse date (2008-02-14 20:30:45 -5)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   178
ok 19 - parse date (2008-02-14 20:30:45 -5:)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   179
ok 20 - parse date (2008-02-14 20:30:45 -05)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   180
ok 21 - parse date (2008-02-14 20:30:45 -:30)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   181
ok 22 - parse date (2008-02-14 20:30:45 -05:00)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   182
ok 23 - parse date (2008-02-14 20:30:45 TZ=EST5)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   183
ok 24 - parse approxidate (now)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   184
ok 25 - parse approxidate (5 seconds ago)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   185
ok 26 - parse approxidate (5.seconds.ago)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   186
ok 27 - parse approxidate (10.minutes.ago)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   187
ok 28 - parse approxidate (yesterday)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   188
ok 29 - parse approxidate (3.days.ago)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   189
ok 30 - parse approxidate (3.weeks.ago)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   190
ok 31 - parse approxidate (3.months.ago)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   191
ok 32 - parse approxidate (2.years.3.months.ago)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   192
ok 33 - parse approxidate (6am yesterday)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   193
ok 34 - parse approxidate (6pm yesterday)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   194
ok 35 - parse approxidate (3:00)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   195
ok 36 - parse approxidate (15:00)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   196
ok 37 - parse approxidate (noon today)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   197
ok 38 - parse approxidate (noon yesterday)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   198
ok 39 - parse approxidate (last tuesday)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   199
ok 40 - parse approxidate (July 5th)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   200
ok 41 - parse approxidate (06/05/2009)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   201
ok 42 - parse approxidate (06.05.2009)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   202
ok 43 - parse approxidate (Jun 6, 5AM)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   203
ok 44 - parse approxidate (5AM Jun 6)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   204
ok 45 - parse approxidate (6AM, June 7, 2009)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   205
# passed all 45 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   206
1..45
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   207
*** t0010-racy-git.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   208
ok 1 - Racy GIT trial #0 part A
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   209
ok 2 - Racy GIT trial #0 part B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   210
ok 3 - Racy GIT trial #1 part A
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   211
ok 4 - Racy GIT trial #1 part B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   212
ok 5 - Racy GIT trial #2 part A
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   213
ok 6 - Racy GIT trial #2 part B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   214
ok 7 - Racy GIT trial #3 part A
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   215
ok 8 - Racy GIT trial #3 part B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   216
ok 9 - Racy GIT trial #4 part A
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   217
ok 10 - Racy GIT trial #4 part B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   218
# passed all 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   219
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   220
*** t0020-crlf.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   221
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   222
ok 2 - safecrlf: autocrlf=input, all CRLF
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   223
ok 3 - safecrlf: autocrlf=input, mixed LF/CRLF
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   224
ok 4 - safecrlf: autocrlf=true, all LF
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   225
ok 5 - safecrlf: autocrlf=true mixed LF/CRLF
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   226
ok 6 - safecrlf: print warning only once
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   227
ok 7 - switch off autocrlf, safecrlf, reset HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   228
ok 8 - update with autocrlf=input
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   229
ok 9 - update with autocrlf=true
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   230
ok 10 - checkout with autocrlf=true
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   231
ok 11 - checkout with autocrlf=input
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   232
ok 12 - apply patch (autocrlf=input)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   233
ok 13 - apply patch --cached (autocrlf=input)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   234
ok 14 - apply patch --index (autocrlf=input)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   235
ok 15 - apply patch (autocrlf=true)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   236
ok 16 - apply patch --cached (autocrlf=true)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   237
ok 17 - apply patch --index (autocrlf=true)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   238
ok 18 - .gitattributes says two is binary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   239
ok 19 - .gitattributes says two is input
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   240
ok 20 - .gitattributes says two and three are text
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   241
ok 21 - in-tree .gitattributes (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   242
ok 22 - in-tree .gitattributes (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   243
ok 23 - in-tree .gitattributes (3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   244
ok 24 - in-tree .gitattributes (4)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   245
ok 25 - checkout with existing .gitattributes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   246
ok 26 - checkout when deleting .gitattributes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   247
ok 27 - invalid .gitattributes (must not crash)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   248
ok 28 - setting up for new autocrlf tests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   249
ok 29 - report no change after setting autocrlf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   250
ok 30 - files are clean after checkout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   251
ok 31 - LF only file gets CRLF with autocrlf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   252
ok 32 - Mixed file is still mixed with autocrlf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   253
ok 33 - CRLF only file has CRLF with autocrlf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   254
ok 34 - New CRLF file gets LF in repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   255
# passed all 34 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   256
1..34
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   257
*** t0021-conversion.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   258
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   259
ok 2 - check
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   260
ok 3 - expanded_in_repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   261
ok 4 - filter shell-escaped filenames
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   262
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   263
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   264
*** t0022-crlf-rename.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   265
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   266
ok 2 - diff -M
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   267
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   268
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   269
*** t0023-crlf-am.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   270
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   271
ok 2 - am
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   272
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   273
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   274
*** t0024-crlf-archive.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   275
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   276
ok 2 - tar archive
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   277
ok 3 - zip archive
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   278
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   279
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   280
*** t0025-crlf-auto.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   281
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   282
ok 2 - default settings cause no changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   283
ok 3 - crlf=true causes a CRLF file to be normalized
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   284
ok 4 - text=true causes a CRLF file to be normalized
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   285
ok 5 - eol=crlf gives a normalized file CRLFs with autocrlf=false
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   286
ok 6 - eol=crlf gives a normalized file CRLFs with autocrlf=input
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   287
ok 7 - eol=lf gives a normalized file LFs with autocrlf=true
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   288
ok 8 - autocrlf=true does not normalize CRLF files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   289
ok 9 - text=auto, autocrlf=true _does_ normalize CRLF files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   290
ok 10 - text=auto, autocrlf=true does not normalize binary files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   291
ok 11 - eol=crlf _does_ normalize binary files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   292
# passed all 11 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   293
1..11
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   294
*** t0026-eol-config.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   295
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   296
ok 2 - eol=lf puts LFs in normalized file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   297
ok 3 - eol=crlf puts CRLFs in normalized file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   298
ok 4 - autocrlf=true overrides eol=lf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   299
ok 5 - autocrlf=true overrides unset eol
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   300
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   301
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   302
*** t0030-stripspace.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   303
ok 1 - long lines without spaces should be unchanged
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   304
ok 2 - lines with spaces at the beginning should be unchanged
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   305
ok 3 - lines with intermediate spaces should be unchanged
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   306
ok 4 - consecutive blank lines should be unified
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   307
ok 5 - only consecutive blank lines should be completely removed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   308
ok 6 - consecutive blank lines at the beginning should be removed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   309
ok 7 - consecutive blank lines at the end should be removed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   310
ok 8 - text without newline at end should end with newline
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   311
ok 9 - text plus spaces without newline at end should end with newline
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   312
ok 10 - text plus spaces without newline at end should not show spaces
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   313
ok 11 - text plus spaces without newline should show the correct lines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   314
ok 12 - text plus spaces at end should not show spaces
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   315
ok 13 - text plus spaces at end should be cleaned and newline must remain
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   316
ok 14 - spaces with newline at end should be replaced with empty string
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   317
ok 15 - spaces without newline at end should not show spaces
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   318
ok 16 - spaces without newline at end should be replaced with empty string
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   319
ok 17 - consecutive text lines should be unchanged
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   320
ok 18 - strip comments, too
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   321
# passed all 18 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   322
1..18
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   323
*** t0040-parse-options.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   324
ok 1 - test help
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   325
ok 2 - short options
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   326
ok 3 - long options
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   327
ok 4 - missing required value
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   328
ok 5 - intermingled arguments
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   329
ok 6 - unambiguously abbreviated option
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   330
ok 7 - unambiguously abbreviated option with "="
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   331
ok 8 - ambiguously abbreviated option
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   332
ok 9 - non ambiguous option (after two options it abbreviates)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   333
ok 10 - detect possible typos
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   334
ok 11 - keep some options as arguments
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   335
ok 12 - OPT_DATE() and OPT_SET_PTR() work
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   336
ok 13 - OPT_CALLBACK() and OPT_BIT() work
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   337
ok 14 - OPT_CALLBACK() and callback errors work
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   338
ok 15 - OPT_BIT() and OPT_SET_INT() work
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   339
ok 16 - OPT_NEGBIT() and OPT_SET_INT() work
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   340
ok 17 - OPT_BIT() works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   341
ok 18 - OPT_NEGBIT() works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   342
ok 19 - OPT_BOOLEAN() with PARSE_OPT_NODASH works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   343
ok 20 - OPT_NUMBER_CALLBACK() works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   344
ok 21 - negation of OPT_NONEG flags is not ambiguous
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   345
ok 22 - --list keeps list of strings
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   346
ok 23 - --no-list resets list
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   347
# passed all 23 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   348
1..23
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   349
*** t0050-filesystem.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   350
ok 1 - see what we expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   351
ok 2 - detection of case insensitive filesystem during repo init
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   352
ok 3 - detection of filesystem w/o symlink support during repo init
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   353
ok 4 - setup case tests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   354
ok 5 - rename (case change)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   355
ok 6 - merge (case change)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   356
not ok 7 - add (with different case) # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   357
ok 8 - setup unicode normalization tests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   358
ok 9 - rename (silent unicode normalization)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   359
ok 10 - merge (silent unicode normalization)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   360
# still have 1 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   361
# passed all remaining 9 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   362
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   363
*** t0055-beyond-symlinks.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   364
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   365
ok 2 - update-index --add beyond symlinks
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   366
ok 3 - add beyond symlinks
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   367
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   368
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   369
*** t0060-path-utils.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   370
ok 1 - normalize path:  => 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   371
ok 2 - normalize path: . => 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   372
ok 3 - normalize path: ./ => 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   373
ok 4 - normalize path: ./. => 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   374
ok 5 - normalize path: ./.. => ++failed++
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   375
ok 6 - normalize path: ../. => ++failed++
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   376
ok 7 - normalize path: ./../.// => ++failed++
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   377
ok 8 - normalize path: dir/.. => 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   378
ok 9 - normalize path: dir/sub/../.. => 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   379
ok 10 - normalize path: dir/sub/../../.. => ++failed++
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   380
ok 11 - normalize path: dir => dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   381
ok 12 - normalize path: dir// => dir/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   382
ok 13 - normalize path: ./dir => dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   383
ok 14 - normalize path: dir/. => dir/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   384
ok 15 - normalize path: dir///./ => dir/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   385
ok 16 - normalize path: dir//sub/.. => dir/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   386
ok 17 - normalize path: dir/sub/../ => dir/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   387
ok 18 - normalize path: dir/sub/../. => dir/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   388
ok 19 - normalize path: dir/s1/../s2/ => dir/s2/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   389
ok 20 - normalize path: d1/s1///s2/..//../s3/ => d1/s3/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   390
ok 21 - normalize path: d1/s1//../s2/../../d2 => d2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   391
ok 22 - normalize path: d1/.../d2 => d1/.../d2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   392
ok 23 - normalize path: d1/..././../d2 => d1/d2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   393
ok 24 - normalize path: / => /
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   394
ok 25 - normalize path: // => /
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   395
ok 26 - normalize path: /// => /
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   396
ok 27 - normalize path: /. => /
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   397
ok 28 - normalize path: /./ => /
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   398
ok 29 - normalize path: /./.. => ++failed++
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   399
ok 30 - normalize path: /../. => ++failed++
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   400
ok 31 - normalize path: /./../.// => ++failed++
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   401
ok 32 - normalize path: /dir/.. => /
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   402
ok 33 - normalize path: /dir/sub/../.. => /
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   403
ok 34 - normalize path: /dir/sub/../../.. => ++failed++
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   404
ok 35 - normalize path: /dir => /dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   405
ok 36 - normalize path: /dir// => /dir/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   406
ok 37 - normalize path: /./dir => /dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   407
ok 38 - normalize path: /dir/. => /dir/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   408
ok 39 - normalize path: /dir///./ => /dir/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   409
ok 40 - normalize path: /dir//sub/.. => /dir/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   410
ok 41 - normalize path: /dir/sub/../ => /dir/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   411
ok 42 - normalize path: //dir/sub/../. => /dir/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   412
ok 43 - normalize path: /dir/s1/../s2/ => /dir/s2/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   413
ok 44 - normalize path: /d1/s1///s2/..//../s3/ => /d1/s3/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   414
ok 45 - normalize path: /d1/s1//../s2/../../d2 => /d2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   415
ok 46 - normalize path: /d1/.../d2 => /d1/.../d2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   416
ok 47 - normalize path: /d1/..././../d2 => /d1/d2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   417
ok 48 - longest ancestor: /  => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   418
ok 49 - longest ancestor: / / => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   419
ok 50 - longest ancestor: /foo  => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   420
ok 51 - longest ancestor: /foo : => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   421
ok 52 - longest ancestor: /foo ::. => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   422
ok 53 - longest ancestor: /foo ::..:: => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   423
ok 54 - longest ancestor: /foo / => 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   424
ok 55 - longest ancestor: /foo /fo => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   425
ok 56 - longest ancestor: /foo /foo => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   426
ok 57 - longest ancestor: /foo /foo/ => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   427
ok 58 - longest ancestor: /foo /bar => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   428
ok 59 - longest ancestor: /foo /bar/ => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   429
ok 60 - longest ancestor: /foo /foo/bar => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   430
ok 61 - longest ancestor: /foo /foo:/bar/ => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   431
ok 62 - longest ancestor: /foo /foo/:/bar/ => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   432
ok 63 - longest ancestor: /foo /foo::/bar/ => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   433
ok 64 - longest ancestor: /foo /:/foo:/bar/ => 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   434
ok 65 - longest ancestor: /foo /foo:/:/bar/ => 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   435
ok 66 - longest ancestor: /foo /:/bar/:/foo => 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   436
ok 67 - longest ancestor: /foo/bar  => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   437
ok 68 - longest ancestor: /foo/bar / => 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   438
ok 69 - longest ancestor: /foo/bar /fo => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   439
ok 70 - longest ancestor: /foo/bar foo => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   440
ok 71 - longest ancestor: /foo/bar /foo => 4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   441
ok 72 - longest ancestor: /foo/bar /foo/ => 4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   442
ok 73 - longest ancestor: /foo/bar /foo/ba => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   443
ok 74 - longest ancestor: /foo/bar /:/fo => 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   444
ok 75 - longest ancestor: /foo/bar /foo:/foo/ba => 4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   445
ok 76 - longest ancestor: /foo/bar /bar => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   446
ok 77 - longest ancestor: /foo/bar /bar/ => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   447
ok 78 - longest ancestor: /foo/bar /fo: => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   448
ok 79 - longest ancestor: /foo/bar :/fo => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   449
ok 80 - longest ancestor: /foo/bar /foo:/bar/ => 4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   450
ok 81 - longest ancestor: /foo/bar /:/foo:/bar/ => 4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   451
ok 82 - longest ancestor: /foo/bar /foo:/:/bar/ => 4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   452
ok 83 - longest ancestor: /foo/bar /:/bar/:/fo => 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   453
ok 84 - longest ancestor: /foo/bar /:/bar/ => 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   454
ok 85 - longest ancestor: /foo/bar .:/foo/. => 4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   455
ok 86 - longest ancestor: /foo/bar .:/foo/.:.: => 4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   456
ok 87 - longest ancestor: /foo/bar /foo/./:.:/bar => 4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   457
ok 88 - longest ancestor: /foo/bar .:/bar => -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   458
ok 89 - strip_path_suffix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   459
# passed all 89 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   460
1..89
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   461
*** t0061-run-command.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   462
ok 1 - start_command reports ENOENT
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   463
ok 2 - run_command can run a command
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   464
ok 3 - run_command reports EACCES
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   465
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   466
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   467
*** t0070-fundamental.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   468
ok 1 - character classes (isspace, isalpha etc.)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   469
ok 2 - mktemp to nonexistent directory prints filename
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   470
ok 3 - mktemp to unwritable directory prints filename
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   471
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   472
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   473
*** t0080-vcs-svn.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   474
ok 1 - obj pool: store data
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   475
ok 2 - obj pool: NULL is offset ~0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   476
ok 3 - obj pool: out-of-bounds access
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   477
ok 4 - obj pool: high-water mark
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   478
ok 5 - string pool
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   479
ok 6 - treap sort
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   480
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   481
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   482
*** t0081-line-buffer.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   483
ok 1 - hello world
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   484
ok 2 - 0-length read, send along greeting
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   485
ok 3 - read from file descriptor
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   486
ok 4 - skip, copy null byte
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   487
ok 5 - read null byte
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   488
ok 6 - long reads are truncated
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   489
ok 7 - long copies are truncated
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   490
ok 8 - long binary reads are truncated
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   491
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   492
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   493
*** t0090-cache-tree.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   494
not ok 1 - initial commit has cache-tree # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   495
ok 2 - read-tree HEAD establishes cache-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   496
ok 3 - git-add invalidates cache-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   497
ok 4 - update-index invalidates cache-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   498
ok 5 - write-tree establishes cache-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   499
ok 6 - test-scrap-cache-tree works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   500
ok 7 - second commit has cache-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   501
ok 8 - reset --hard gives cache-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   502
ok 9 - reset --hard without index gives cache-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   503
not ok 10 - checkout gives cache-tree # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   504
# still have 2 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   505
# passed all remaining 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   506
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   507
*** t0100-previous.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   508
ok 1 - branch -d @{-1}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   509
ok 2 - branch -d @{-12} when there is not enough switches yet
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   510
ok 3 - merge @{-1}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   511
ok 4 - merge @{-1} when there is not enough switches yet
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   512
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   513
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   514
*** t0101-at-syntax.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   515
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   516
ok 2 - @{0} shows current
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   517
ok 3 - @{1} shows old
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   518
ok 4 - @{now} shows current
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   519
ok 5 - @{2001-09-17} (before the first commit) shows old
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   520
ok 6 - silly approxidates work
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   521
ok 7 - notice misspelled upstream
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   522
ok 8 - complain about total nonsense
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   523
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   524
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   525
*** t0200-gettext-basic.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   526
# lib-gettext: Found 'is_IS.UTF-8' as an is_IS UTF-8 locale
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   527
# lib-gettext: Found 'is_IS.ISO8859-1' as an is_IS ISO-8859-1 locale
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   528
ok 1 - sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to gnu)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   529
ok 2 - sanity: $TEXTDOMAIN is git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   530
ok 3 - xgettext sanity: Perl _() strings are not extracted
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   531
ok 4 - xgettext sanity: Comment extraction with --add-comments
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   532
ok 5 - xgettext sanity: Comment extraction with --add-comments stops at statements
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   533
ok 6 - sanity: $TEXTDOMAINDIR exists without NO_GETTEXT=YesPlease
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   534
ok 7 - sanity: Icelandic locale was compiled
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   535
ok 8 - sanity: gettext("") metadata is OK
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   536
ok 9 - sanity: gettext(unknown) is passed through
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   537
ok 10 - xgettext: C extraction of _() and N_() strings
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   538
ok 11 - xgettext: C extraction with %s
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   539
ok 12 - xgettext: Shell extraction
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   540
ok 13 - xgettext: Shell extraction with $variable
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   541
ok 14 - xgettext: Perl extraction
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   542
ok 15 - xgettext: Perl extraction with %s
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   543
ok 16 - sanity: Some gettext("") data for real locale
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   544
# passed all 16 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   545
1..16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   546
*** t0201-gettext-fallbacks.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   547
# lib-gettext: No is_IS UTF-8 locale available
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   548
# lib-gettext: No is_IS ISO-8859-1 locale available
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   549
ok 1 - sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to fallthrough)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   550
ok 2 - sanity: $GIT_INTERNAL_GETTEXT_TEST_FALLBACKS is set
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   551
ok 3 - sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   552
ok 4 - gettext: our gettext() fallback has pass-through semantics
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   553
ok 5 - eval_gettext: our eval_gettext() fallback has pass-through semantics
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   554
ok 6 - eval_gettext: our eval_gettext() fallback can interpolate variables
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   555
ok 7 - eval_gettext: our eval_gettext() fallback can interpolate variables with spaces
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   556
ok 8 - eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   557
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   558
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   559
*** t0202-gettext-perl.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   560
# lib-gettext: Found 'is_IS.UTF-8' as an is_IS UTF-8 locale
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   561
# lib-gettext: Found 'is_IS.ISO8859-1' as an is_IS ISO-8859-1 locale
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   562
# run 1: Perl Git::I18N API ($(PERL) $(@D)/t/t0202/test.pl)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   563
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   564
# test_external test Perl Git::I18N API failed: $(PERL) $(@D)/t/t0202/test.pl
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   565
# test_external_without_stderr test no stderr: Perl Git::I18N API failed: $(PERL) $(@D)/t/t0202/test.pl: 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   566
make[3]: [t0202-gettext-perl.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   567
*** t0203-gettext-setlocale-sanity.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   568
# lib-gettext: Found 'is_IS.UTF-8' as an is_IS UTF-8 locale
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   569
# lib-gettext: Found 'is_IS.ISO8859-1' as an is_IS ISO-8859-1 locale
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   570
ok 1 - git show a ISO-8859-1 commit under C locale
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   571
ok 2 - git show a ISO-8859-1 commit under a UTF-8 locale
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   572
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   573
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   574
*** t0204-gettext-reencode-sanity.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   575
# lib-gettext: Found 'is_IS.UTF-8' as an is_IS UTF-8 locale
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   576
# lib-gettext: Found 'is_IS.ISO8859-1' as an is_IS ISO-8859-1 locale
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   577
ok 1 - gettext: Emitting UTF-8 from our UTF-8 *.mo files / Icelandic
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   578
ok 2 - gettext: Emitting UTF-8 from our UTF-8 *.mo files / Runes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   579
ok 3 - gettext: Emitting ISO-8859-1 from our UTF-8 *.mo files / Icelandic
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   580
ok 4 - gettext: Emitting ISO-8859-1 from our UTF-8 *.mo files / Runes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   581
not ok - 5 gettext: Fetching a UTF-8 msgid -> UTF-8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   582
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   583
#	    printf "TILRAUN: ‚einfaldar‘ og „tvöfaldar“ gæsalappir" >expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   584
#	    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: ‘single’ and “double” quotes" >actual &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   585
#	    test_cmp expect actual
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   586
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   587
not ok - 6 gettext: Fetching a UTF-8 msgid -> ISO-8859-1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   588
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   589
#	    LANGUAGE=is LC_ALL="$is_IS_iso_locale" gettext "TEST: ‘single’ and “double” quotes" >actual &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   590
#	    grep "einfaldar" actual &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   591
#	    grep "$(echo tvöfaldar | iconv -f UTF-8 -t ISO8859-1)" actual
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   592
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   593
ok 7 - gettext.c: git init UTF-8 -> UTF-8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   594
ok 8 - gettext.c: git init UTF-8 -> ISO-8859-1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   595
# failed 2 among 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   596
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   597
make[3]: [t0204-gettext-reencode-sanity.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   598
*** t0205-gettext-poison.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   599
# lib-gettext: Found 'is_IS.UTF-8' as an is_IS UTF-8 locale
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   600
# lib-gettext: Found 'is_IS.ISO8859-1' as an is_IS ISO-8859-1 locale
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   601
ok 1 # skip sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to gnu) (missing GETTEXT_POISON)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   602
ok 2 # skip sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is poison (missing GETTEXT_POISON)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   603
ok 3 # skip gettext: our gettext() fallback has poison semantics (missing GETTEXT_POISON)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   604
ok 4 # skip eval_gettext: our eval_gettext() fallback has poison semantics (missing GETTEXT_POISON)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   605
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   606
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   607
*** t0300-credentials.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   608
ok 1 - setup helper scripts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   609
ok 2 - credential_fill invokes helper
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   610
ok 3 - credential_fill invokes multiple helpers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   611
ok 4 - credential_fill stops when we get a full response
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   612
ok 5 - credential_fill continues through partial response
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   613
ok 6 - credential_fill passes along metadata
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   614
ok 7 - credential_approve calls all helpers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   615
ok 8 - do not bother storing password-less credential
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   616
ok 9 - credential_reject calls all helpers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   617
ok 10 - usernames can be preserved
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   618
ok 11 - usernames can be overridden
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   619
ok 12 - do not bother completing already-full credential
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   620
ok 13 - empty helper list falls back to internal getpass
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   621
ok 14 - internal getpass does not ask for known username
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   622
ok 15 - respect configured credentials
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   623
ok 16 - match configured credential
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   624
ok 17 - do not match configured credential
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   625
ok 18 - pull username from config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   626
ok 19 - http paths can be part of context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   627
# passed all 19 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   628
1..19
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   629
*** t0301-credential-cache.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   630
ok 1 - helper (cache) has no existing data
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   631
ok 2 - helper (cache) stores password
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   632
ok 3 - helper (cache) can retrieve password
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   633
ok 4 - helper (cache) requires matching protocol
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   634
ok 5 - helper (cache) requires matching host
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   635
ok 6 - helper (cache) requires matching username
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   636
ok 7 - helper (cache) requires matching path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   637
ok 8 - helper (cache) can forget host
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   638
ok 9 - helper (cache) can store multiple users
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   639
ok 10 - helper (cache) can forget user
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   640
ok 11 - helper (cache) remembers other user
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   641
ok 12 - helper (cache --timeout=1) times out
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   642
# passed all 12 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   643
1..12
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   644
*** t0302-credential-store.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   645
ok 1 - helper (store) has no existing data
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   646
ok 2 - helper (store) stores password
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   647
ok 3 - helper (store) can retrieve password
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   648
ok 4 - helper (store) requires matching protocol
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   649
ok 5 - helper (store) requires matching host
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   650
ok 6 - helper (store) requires matching username
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   651
ok 7 - helper (store) requires matching path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   652
ok 8 - helper (store) can forget host
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   653
ok 9 - helper (store) can store multiple users
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   654
ok 10 - helper (store) can forget user
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   655
ok 11 - helper (store) remembers other user
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   656
# passed all 11 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   657
1..11
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   658
*** t0303-credential-external.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   659
# skipping external helper tests (set GIT_TEST_CREDENTIAL_HELPER)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   660
# skipping external helper timeout tests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   661
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   662
1..0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   663
*** t1000-read-tree-m-3way.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   664
ok 1 - adding test file NN and Z/NN
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   665
ok 2 - adding test file ND and Z/ND
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   666
ok 3 - adding test file NM and Z/NM
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   667
ok 4 - adding test file DN and Z/DN
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   668
ok 5 - adding test file DD and Z/DD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   669
ok 6 - adding test file DM and Z/DM
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   670
ok 7 - adding test file MN and Z/MN
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   671
ok 8 - adding test file MD and Z/MD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   672
ok 9 - adding test file MM and Z/MM
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   673
ok 10 - adding test file SS
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   674
ok 11 - adding test file TT
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   675
ok 12 - prepare initial tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   676
ok 13 - change in branch A (removal)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   677
ok 14 - change in branch A (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   678
ok 15 - change in branch A (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   679
ok 16 - change in branch A (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   680
ok 17 - change in branch A (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   681
ok 18 - change in branch A (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   682
ok 19 - change in branch A (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   683
ok 20 - change in branch A (addition)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   684
ok 21 - change in branch A (addition)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   685
ok 22 - change in branch A (addition)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   686
ok 23 - change in branch A (addition)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   687
ok 24 - change in branch A (addition)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   688
ok 25 - change in branch A (edit)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   689
ok 26 - change in branch A (change file to directory)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   690
ok 27 - recording branch A tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   691
ok 28 - reading original tree and checking out
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   692
ok 29 - change in branch B (removal)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   693
ok 30 - change in branch B (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   694
ok 31 - change in branch B (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   695
ok 32 - change in branch B (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   696
ok 33 - change in branch B (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   697
ok 34 - change in branch B (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   698
ok 35 - change in branch B (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   699
ok 36 - change in branch B (addition)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   700
ok 37 - change in branch B (addition)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   701
ok 38 - change in branch B (addition)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   702
ok 39 - change in branch B (addition)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   703
ok 40 - change in branch B (addition and modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   704
ok 41 - change in branch B (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   705
ok 42 - change in branch B (addition of a file to conflict with directory)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   706
ok 43 - recording branch B tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   707
ok 44 - keep contents of 3 trees for easy access
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   708
ok 45 - 3-way merge with git read-tree -m, empty cache
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   709
ok 46 - 3-way merge with git read-tree -m, match H
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   710
ok 47 - 1 - must not have an entry not in A.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   711
ok 48 - 2 - must match B in !O && !A && B case.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   712
ok 49 - 2 - matching B alone is OK in !O && !A && B case.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   713
ok 50 - 3 - must match A in !O && A && !B case.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   714
ok 51 - 3 - matching A alone is OK in !O && A && !B case.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   715
ok 52 - 3 (fail) - must match A in !O && A && !B case.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   716
ok 53 - 4 - must match and be up-to-date in !O && A && B && A!=B case.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   717
ok 54 - 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   718
ok 55 - 4 (fail) - must match and be up-to-date in !O && A && B && A!=B case.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   719
ok 56 - 5 - must match in !O && A && B && A==B case.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   720
ok 57 - 5 - must match in !O && A && B && A==B case.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   721
ok 58 - 5 (fail) - must match A in !O && A && B && A==B case.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   722
ok 59 - 6 - must not exist in O && !A && !B case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   723
ok 60 - 7 - must not exist in O && !A && B && O!=B case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   724
ok 61 - 8 - must not exist in O && !A && B && O==B case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   725
ok 62 - 9 - must match and be up-to-date in O && A && !B && O!=A case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   726
ok 63 - 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   727
ok 64 - 9 (fail) - must match and be up-to-date in O && A && !B && O!=A case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   728
ok 65 - 10 - must match and be up-to-date in O && A && !B && O==A case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   729
ok 66 - 10 (fail) - must match and be up-to-date in O && A && !B && O==A case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   730
ok 67 - 10 (fail) - must match and be up-to-date in O && A && !B && O==A case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   731
ok 68 - 11 - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   732
ok 69 - 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   733
ok 70 - 11 (fail) - must match and be up-to-date in O && A && B && O!=A && O!=B && A!=B case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   734
ok 71 - 12 - must match A in O && A && B && O!=A && A==B case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   735
ok 72 - 12 - must match A in O && A && B && O!=A && A==B case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   736
ok 73 - 12 (fail) - must match A in O && A && B && O!=A && A==B case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   737
ok 74 - 13 - must match A in O && A && B && O!=A && O==B case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   738
ok 75 - 13 - must match A in O && A && B && O!=A && O==B case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   739
ok 76 - 14 - must match and be up-to-date in O && A && B && O==A && O!=B case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   740
ok 77 - 14 - may match B in O && A && B && O==A && O!=B case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   741
ok 78 - 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   742
ok 79 - 14 (fail) - must match and be up-to-date in O && A && B && O==A && O!=B case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   743
ok 80 - 15 - must match A in O && A && B && O==A && O==B case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   744
ok 81 - 15 - must match A in O && A && B && O==A && O==B case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   745
ok 82 - 15 (fail) - must match A in O && A && B && O==A && O==B case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   746
ok 83 - 16 - A matches in one and B matches in another.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   747
# passed all 83 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   748
1..83
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   749
*** t1001-read-tree-m-2way.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   750
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   751
ok 2 - 1, 2, 3 - no carry forward
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   752
ok 3 - 4 - carry forward local addition.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   753
ok 4 - 5 - carry forward local addition.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   754
ok 5 - 6 - local addition already has the same.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   755
ok 6 - 7 - local addition already has the same.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   756
ok 7 - 8 - conflicting addition.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   757
ok 8 - 9 - conflicting addition.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   758
ok 9 - 10 - path removed.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   759
ok 10 - 11 - dirty path removed.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   760
ok 11 - 12 - unmatching local changes being removed.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   761
ok 12 - 13 - unmatching local changes being removed.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   762
ok 13 - 14 - unchanged in two heads.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   763
ok 14 - 15 - unchanged in two heads.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   764
ok 15 - 16 - conflicting local change.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   765
ok 16 - 17 - conflicting local change.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   766
ok 17 - 18 - local change already having a good result.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   767
ok 18 - 19 - local change already having a good result, further modified.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   768
ok 19 - 20 - no local change, use new tree.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   769
ok 20 - 21 - no local change, dirty cache.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   770
ok 21 - 22 - local change cache updated.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   771
ok 22 - DF vs DF/DF case setup.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   772
ok 23 - DF vs DF/DF case test.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   773
ok 24 - a/b (untracked) vs a case setup.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   774
ok 25 - a/b (untracked) vs a, plus c/d case test.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   775
ok 26 - a/b vs a, plus c/d case setup.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   776
ok 27 - a/b vs a, plus c/d case test.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   777
ok 28 - -m references the correct modified tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   778
# passed all 28 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   779
1..28
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   780
*** t1002-read-tree-m-u-2way.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   781
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   782
ok 2 - 1, 2, 3 - no carry forward
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   783
ok 3 - 4 - carry forward local addition.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   784
ok 4 - 5 - carry forward local addition.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   785
ok 5 - 6 - local addition already has the same.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   786
ok 6 - 7 - local addition already has the same.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   787
ok 7 - 8 - conflicting addition.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   788
ok 8 - 9 - conflicting addition.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   789
ok 9 - 10 - path removed.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   790
ok 10 - 11 - dirty path removed.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   791
ok 11 - 12 - unmatching local changes being removed.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   792
ok 12 - 13 - unmatching local changes being removed.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   793
ok 13 - 14 - unchanged in two heads.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   794
ok 14 - 15 - unchanged in two heads.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   795
ok 15 - 16 - conflicting local change.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   796
ok 16 - 17 - conflicting local change.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   797
ok 17 - 18 - local change already having a good result.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   798
ok 18 - 19 - local change already having a good result, further modified.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   799
ok 19 - 20 - no local change, use new tree.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   800
ok 20 - 21 - no local change, dirty cache.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   801
ok 21 - DF vs DF/DF case setup.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   802
ok 22 - DF vs DF/DF case test.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   803
# passed all 22 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   804
1..22
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   805
*** t1003-read-tree-prefix.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   806
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   807
ok 2 - read-tree --prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   808
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   809
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   810
*** t1004-read-tree-m-u-wf.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   811
ok 1 - two-way setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   812
ok 2 - two-way not clobbering
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   813
ok 3 - two-way with incorrect --exclude-per-directory (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   814
ok 4 - two-way with incorrect --exclude-per-directory (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   815
ok 5 - two-way clobbering a ignored file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   816
ok 6 - three-way not complaining on an untracked path in both
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   817
ok 7 - three-way not clobbering a working tree file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   818
ok 8 - three-way not complaining on an untracked file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   819
ok 9 - 3-way not overwriting local changes (setup)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   820
ok 10 - 3-way not overwriting local changes (our side)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   821
ok 11 - 3-way not overwriting local changes (their side)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   822
ok 12 - funny symlink in work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   823
ok 13 - funny symlink in work tree, un-unlink-able
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   824
ok 14 - D/F setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   825
ok 15 - D/F
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   826
ok 16 - D/F resolve
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   827
ok 17 - D/F recursive
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   828
# passed all 17 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   829
1..17
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   830
*** t1005-read-tree-reset.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   831
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   832
ok 2 - reset should work
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   833
ok 3 - reset should remove remnants from a failed merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   834
ok 4 - Porcelain reset should remove remnants too
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   835
ok 5 - Porcelain checkout -f should remove remnants too
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   836
ok 6 - Porcelain checkout -f HEAD should remove remnants too
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   837
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   838
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   839
*** t1006-cat-file.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   840
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   841
ok 2 - blob exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   842
ok 3 - Type of blob is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   843
ok 4 - Size of blob is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   844
ok 5 - Content of blob is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   845
ok 6 - Pretty content of blob is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   846
ok 7 - --batch output of blob is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   847
ok 8 - --batch-check output of blob is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   848
ok 9 - tree exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   849
ok 10 - Type of tree is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   850
ok 11 - Size of tree is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   851
ok 12 - Pretty content of tree is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   852
ok 13 - --batch-check output of tree is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   853
ok 14 - commit exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   854
ok 15 - Type of commit is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   855
ok 16 - Size of commit is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   856
ok 17 - Content of commit is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   857
ok 18 - Pretty content of commit is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   858
ok 19 - --batch output of commit is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   859
ok 20 - --batch-check output of commit is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   860
ok 21 - tag exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   861
ok 22 - Type of tag is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   862
ok 23 - Size of tag is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   863
ok 24 - Content of tag is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   864
ok 25 - Pretty content of tag is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   865
ok 26 - --batch output of tag is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   866
ok 27 - --batch-check output of tag is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   867
ok 28 - Reach a blob from a tag pointing to it
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   868
ok 29 - Passing -t with --batch fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   869
ok 30 - Passing --batch with -t fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   870
ok 31 - Passing -s with --batch fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   871
ok 32 - Passing --batch with -s fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   872
ok 33 - Passing -e with --batch fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   873
ok 34 - Passing --batch with -e fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   874
ok 35 - Passing -p with --batch fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   875
ok 36 - Passing --batch with -p fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   876
ok 37 - Passing <type> with --batch fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   877
ok 38 - Passing --batch with <type> fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   878
ok 39 - Passing sha1 with --batch fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   879
ok 40 - Passing -t with --batch-check fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   880
ok 41 - Passing --batch-check with -t fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   881
ok 42 - Passing -s with --batch-check fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   882
ok 43 - Passing --batch-check with -s fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   883
ok 44 - Passing -e with --batch-check fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   884
ok 45 - Passing --batch-check with -e fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   885
ok 46 - Passing -p with --batch-check fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   886
ok 47 - Passing --batch-check with -p fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   887
ok 48 - Passing <type> with --batch-check fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   888
ok 49 - Passing --batch-check with <type> fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   889
ok 50 - Passing sha1 with --batch-check fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   890
ok 51 - --batch-check for a non-existent named object
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   891
ok 52 - --batch-check for a non-existent hash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   892
ok 53 - --batch for an existent and a non-existent hash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   893
ok 54 - --batch-check for an emtpy line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   894
ok 55 - --batch with multiple sha1s gives correct format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   895
ok 56 - --batch-check with multiple sha1s gives correct format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   896
# passed all 56 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   897
1..56
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   898
*** t1007-hash-object.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   899
ok 1 - multiple '--stdin's are rejected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   900
ok 2 - Can't use --stdin and --stdin-paths together
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   901
ok 3 - Can't pass filenames as arguments with --stdin-paths
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   902
ok 4 - Can't use --path with --stdin-paths
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   903
ok 5 - Can't use --path with --no-filters
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   904
ok 6 - hash a file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   905
ok 7 - blob does not exist in database
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   906
ok 8 - hash from stdin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   907
ok 9 - blob does not exist in database
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   908
ok 10 - hash a file and write to database
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   909
ok 11 - blob exists in database
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   910
ok 12 - git hash-object --stdin file1 <file0 first operates on file0, then file1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   911
ok 13 - check that appropriate filter is invoke when --path is used
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   912
ok 14 - check that --no-filters option works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   913
ok 15 - check that --no-filters option works with --stdin-paths
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   914
ok 16 - hash from stdin and write to database (-w --stdin)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   915
ok 17 - blob exists in database
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   916
ok 18 - hash from stdin and write to database (--stdin -w)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   917
ok 19 - blob exists in database
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   918
ok 20 - hash two files with names on stdin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   919
ok 21 - hash two files with names on stdin and write to database (-w --stdin-paths)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   920
ok 22 - blob exists in database
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   921
ok 23 - blob exists in database
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   922
ok 24 - hash two files with names on stdin and write to database (--stdin-paths -w)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   923
ok 25 - blob exists in database
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   924
ok 26 - blob exists in database
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   925
ok 27 - corrupt tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   926
ok 28 - corrupt commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   927
ok 29 - corrupt tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   928
# passed all 29 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   929
1..29
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   930
*** t1008-read-tree-overlay.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   931
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   932
ok 2 - multi-read
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   933
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   934
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   935
*** t1009-read-tree-new-index.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   936
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   937
ok 2 - non-existent index file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   938
ok 3 - empty index file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   939
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   940
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   941
*** t1010-mktree.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   942
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   943
ok 2 - ls-tree piped to mktree (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   944
ok 3 - ls-tree piped to mktree (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   945
ok 4 - ls-tree output in wrong order given to mktree (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   946
ok 5 - ls-tree output in wrong order given to mktree (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   947
ok 6 - allow missing object with --missing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   948
ok 7 - mktree refuses to read ls-tree -r output (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   949
ok 8 - mktree refuses to read ls-tree -r output (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   950
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   951
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   952
*** t1011-read-tree-sparse-checkout.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   953
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   954
ok 2 - read-tree without .git/info/sparse-checkout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   955
ok 3 - read-tree with .git/info/sparse-checkout but disabled
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   956
ok 4 - read-tree --no-sparse-checkout with empty .git/info/sparse-checkout and enabled
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   957
ok 5 - read-tree with empty .git/info/sparse-checkout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   958
ok 6 - match directories with trailing slash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   959
ok 7 - match directories without trailing slash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   960
ok 8 - match directories with negated patterns
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   961
ok 9 - match directories with negated patterns (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   962
ok 10 - match directory pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   963
ok 11 - checkout area changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   964
ok 12 - read-tree updates worktree, absent case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   965
ok 13 - read-tree updates worktree, dirty case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   966
ok 14 - read-tree removes worktree, dirty case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   967
ok 15 - read-tree adds to worktree, absent case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   968
ok 16 - read-tree adds to worktree, dirty case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   969
ok 17 - index removal and worktree narrowing at the same time
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   970
ok 18 - read-tree --reset removes outside worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   971
ok 19 - print errors when failed to update worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   972
# passed all 19 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   973
1..19
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   974
*** t1012-read-tree-df.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   975
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   976
ok 2 - 3-way (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   977
ok 3 - 3-way (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   978
ok 4 - 3-way (3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   979
ok 5 - 2-way (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   980
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   981
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   982
*** t1013-loose-object-format.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   983
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   984
ok 2 - read standard-format loose objects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   985
ok 3 - read experimental-format loose objects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   986
ok 4 - read standard-format objects deflated with smaller window buffer
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   987
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   988
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   989
*** t1020-subdirectory.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   990
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   991
ok 2 - update-index and ls-files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   992
ok 3 - cat-file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   993
ok 4 - diff-files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   994
ok 5 - write-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   995
ok 6 - checkout-index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   996
ok 7 - read-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   997
ok 8 - alias expansion
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   998
ok 9 - !alias expansion
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
   999
ok 10 - GIT_PREFIX for !alias
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1000
ok 11 - GIT_PREFIX for built-ins
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1001
ok 12 - no file/rev ambiguity check inside .git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1002
ok 13 - no file/rev ambiguity check inside a bare repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1003
ok 14 - detection should not be fooled by a symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1004
# passed all 14 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1005
1..14
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1006
*** t1021-rerere-in-workdir.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1007
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1008
ok 2 - rerere in workdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1009
not ok 3 - rerere in workdir (relative) # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1010
# still have 1 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1011
# passed all remaining 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1012
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1013
*** t1050-large.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1014
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1015
ok 2 - add a large file or two
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1016
ok 3 - checkout a large file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1017
ok 4 - packsize limit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1018
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1019
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1020
*** t1100-commit-tree-options.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1021
ok 1 - test preparation: write empty tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1022
ok 2 - construct commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1023
ok 3 - read commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1024
ok 4 - compare commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1025
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1026
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1027
*** t1200-tutorial.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1028
ok 1 - blob
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1029
ok 2 - blob 557db03
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1030
ok 3 - git diff-files -p
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1031
ok 4 - git diff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1032
ok 5 - tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1033
ok 6 - git diff-index -p HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1034
ok 7 - git diff HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1035
ok 8 - git whatchanged -p --root
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1036
ok 9 - git tag my-first-tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1037
ok 10 - git checkout -b mybranch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1038
ok 11 - git branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1039
ok 12 - git resolve now fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1040
ok 13 - git show-branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1041
ok 14 - git resolve
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1042
ok 15 - git resolve output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1043
ok 16 - git show-branch (part 2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1044
ok 17 - git show-branch (part 3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1045
ok 18 - rewind to "Some fun." and "Some work."
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1046
ok 19 - git show-branch (part 4)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1047
ok 20 - manual merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1048
ok 21 - git ls-files --stage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1049
ok 22 - git ls-files --unmerged
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1050
ok 23 - git-merge-index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1051
ok 24 - git ls-files --stage (part 2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1052
ok 25 - git repack
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1053
ok 26 - git prune-packed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1054
ok 27 - -> only packed objects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1055
# passed all 27 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1056
1..27
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1057
*** t1300-repo-config.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1058
ok 1 - clear default config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1059
ok 2 - initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1060
ok 3 - mixed case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1061
ok 4 - similar section
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1062
ok 5 - uppercase section
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1063
ok 6 - replace with non-match
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1064
ok 7 - replace with non-match (actually matching)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1065
ok 8 - non-match result
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1066
ok 9 - find mixed-case key by canonical name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1067
ok 10 - find mixed-case key by non-canonical name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1068
ok 11 - subsections are not canonicalized by git-config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1069
ok 12 - unset with cont. lines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1070
ok 13 - unset with cont. lines is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1071
ok 14 - multiple unset
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1072
ok 15 - multiple unset is correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1073
ok 16 - --replace-all missing value
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1074
ok 17 - --replace-all
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1075
ok 18 - all replaced
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1076
ok 19 - really mean test
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1077
ok 20 - really really mean test
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1078
ok 21 - get value
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1079
ok 22 - unset
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1080
ok 23 - multivar
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1081
ok 24 - non-match
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1082
ok 25 - non-match value
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1083
ok 26 - ambiguous get
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1084
ok 27 - get multivar
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1085
ok 28 - multivar replace
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1086
ok 29 - ambiguous value
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1087
ok 30 - ambiguous unset
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1088
ok 31 - invalid unset
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1089
ok 32 - multivar unset
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1090
ok 33 - invalid key
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1091
ok 34 - correct key
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1092
ok 35 - hierarchical section
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1093
ok 36 - hierarchical section value
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1094
ok 37 - working --list
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1095
ok 38 - --list without repo produces empty output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1096
ok 39 - --get-regexp
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1097
ok 40 - --add
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1098
ok 41 - get variable with no value
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1099
ok 42 - get variable with empty value
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1100
ok 43 - get-regexp variable with no value
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1101
ok 44 - get-regexp --bool variable with no value
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1102
ok 45 - get-regexp variable with empty value
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1103
ok 46 - get bool variable with no value
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1104
ok 47 - get bool variable with empty value
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1105
ok 48 - no arguments, but no crash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1106
ok 49 - new section is partial match of another
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1107
ok 50 - new variable inserts into proper section
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1108
ok 51 - alternative GIT_CONFIG (non-existing file should fail)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1109
ok 52 - alternative GIT_CONFIG
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1110
ok 53 - alternative GIT_CONFIG (--file)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1111
ok 54 - refer config from subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1112
ok 55 - --set in alternative GIT_CONFIG
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1113
ok 56 - rename section
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1114
ok 57 - rename succeeded
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1115
ok 58 - rename non-existing section
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1116
ok 59 - rename succeeded
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1117
ok 60 - rename another section
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1118
ok 61 - rename succeeded
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1119
ok 62 - rename a section with a var on the same line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1120
ok 63 - rename succeeded
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1121
ok 64 - remove section
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1122
ok 65 - section was removed properly
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1123
ok 66 - section ending
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1124
ok 67 - numbers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1125
ok 68 - invalid unit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1126
ok 69 - bool
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1127
ok 70 - invalid bool (--get)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1128
ok 71 - invalid bool (set)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1129
ok 72 - set --bool
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1130
ok 73 - set --int
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1131
ok 74 - get --bool-or-int
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1132
ok 75 - set --bool-or-int
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1133
ok 76 - set --path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1134
ok 77 - get --path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1135
ok 78 - get --path copes with unset $HOME
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1136
ok 79 - quoting
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1137
ok 80 - key with newline
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1138
ok 81 - value with newline
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1139
ok 82 - value continued on next line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1140
ok 83 - --null --list
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1141
ok 84 - --null --get-regexp
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1142
ok 85 - inner whitespace kept verbatim
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1143
ok 86 - symlinked configuration
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1144
ok 87 - nonexistent configuration
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1145
ok 88 - symlink to nonexistent configuration
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1146
ok 89 - check split_cmdline return
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1147
ok 90 - git -c "key=value" support
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1148
ok 91 - key sanity-checking
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1149
ok 92 - git -c works with aliases of builtins
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1150
ok 93 - git -c does not split values on equals
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1151
ok 94 - git -c dies on bogus config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1152
ok 95 - git -c complains about empty key
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1153
ok 96 - git -c complains about empty key and value
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1154
# passed all 96 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1155
1..96
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1156
*** t1301-shared-repo.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1157
ok 1 - shared = 0400 (faulty permission u-w)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1158
ok 2 - shared=1 does not clear bits preset by umask 002
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1159
ok 3 - shared=1 does not clear bits preset by umask 022
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1160
ok 4 - shared=all
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1161
ok 5 - update-server-info honors core.sharedRepository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1162
ok 6 - shared = 0660 (r--r-----) ro
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1163
ok 7 - shared = 0660 (rw-rw----) rw
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1164
ok 8 - shared = 0640 (r--r-----) ro
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1165
ok 9 - shared = 0640 (rw-r-----) rw
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1166
ok 10 - shared = 0600 (r--------) ro
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1167
ok 11 - shared = 0600 (rw-------) rw
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1168
ok 12 - shared = 0666 (r--r--r--) ro
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1169
ok 13 - shared = 0666 (rw-rw-rw-) rw
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1170
ok 14 - shared = 0664 (r--r--r--) ro
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1171
ok 15 - shared = 0664 (rw-rw-r--) rw
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1172
ok 16 - git reflog expire honors core.sharedRepository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1173
ok 17 - forced modes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1174
# passed all 17 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1175
1..17
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1176
*** t1302-repo-version.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1177
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1178
ok 2 - gitdir selection on normal repos
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1179
ok 3 - gitdir selection on unsupported repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1180
ok 4 - gitdir not required mode
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1181
ok 5 - gitdir required mode
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1182
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1183
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1184
*** t1303-wacky-config.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1185
ok 1 - modify same key
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1186
ok 2 - add key in same section
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1187
ok 3 - add key in different section
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1188
ok 4 - make sure git config escapes section names properly
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1189
ok 5 - do not crash on special long config line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1190
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1191
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1192
*** t1304-default-acl.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1193
Unable to use setfacl (output: 'File system doesn't support aclent_t style ACL's.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1194
See acl(5) for more information on ACL styles support by Solaris.'; return code: '2')
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1195
ok 1 # skip Setup test repo (missing SETFACL)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1196
ok 2 # skip Objects creation does not break ACLs with restrictive umask (missing SETFACL)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1197
ok 3 # skip git gc does not break ACLs with restrictive umask (missing SETFACL)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1198
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1199
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1200
*** t1400-update-ref.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1201
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1202
ok 2 - create refs/heads/master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1203
ok 3 - create refs/heads/master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1204
ok 4 - fail to delete refs/heads/master with stale ref
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1205
ok 5 - delete refs/heads/master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1206
ok 6 - delete refs/heads/master without oldvalue verification
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1207
ok 7 - fail to create refs/heads/gu/fixes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1208
ok 8 - create refs/heads/master (by HEAD)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1209
ok 9 - create refs/heads/master (by HEAD)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1210
ok 10 - fail to delete refs/heads/master (by HEAD) with stale ref
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1211
ok 11 - delete refs/heads/master (by HEAD)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1212
ok 12 - delete symref without dereference
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1213
ok 13 - delete symref without dereference when the referred ref is packed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1214
ok 14 - (not) create HEAD with old sha1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1215
ok 15 - (not) prior created .git/refs/heads/master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1216
ok 16 - create HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1217
ok 17 - (not) change HEAD with wrong SHA1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1218
ok 18 - (not) changed .git/refs/heads/master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1219
ok 19 - create refs/heads/master (logged by touch)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1220
ok 20 - update refs/heads/master (logged by touch)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1221
ok 21 - set refs/heads/master (logged by touch)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1222
ok 22 - verifying refs/heads/master's log
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1223
ok 23 - enable core.logAllRefUpdates
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1224
ok 24 - create refs/heads/master (logged by config)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1225
ok 25 - update refs/heads/master (logged by config)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1226
ok 26 - set refs/heads/master (logged by config)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1227
ok 27 - verifying refs/heads/master's log
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1228
ok 28 - Query "master@{May 25 2005}" (before history)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1229
ok 29 - Query master@{2005-05-25} (before history)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1230
ok 30 - Query "master@{May 26 2005 23:31:59}" (1 second before history)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1231
ok 31 - Query "master@{May 26 2005 23:32:00}" (exactly history start)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1232
ok 32 - Query "master@{May 26 2005 23:32:30}" (first non-creation change)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1233
ok 33 - Query "master@{2005-05-26 23:33:01}" (middle of history with gap)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1234
ok 34 - Query "master@{2005-05-26 23:38:00}" (middle of history)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1235
ok 35 - Query "master@{2005-05-26 23:43:00}" (exact end of history)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1236
ok 36 - Query "master@{2005-05-28}" (past end of history)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1237
ok 37 - creating initial files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1238
ok 38 - git commit logged updates
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1239
ok 39 - git cat-file blob master:F (expect OTHER)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1240
ok 40 - git cat-file blob master@{2005-05-26 23:30}:F (expect TEST)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1241
ok 41 - git cat-file blob master@{2005-05-26 23:42}:F (expect OTHER)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1242
# passed all 41 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1243
1..41
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1244
*** t1401-symbolic-ref.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1245
ok 1 - symbolic-ref writes HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1246
ok 2 - symbolic-ref reads HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1247
ok 3 - symbolic-ref refuses non-ref for HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1248
ok 4 - symbolic-ref refuses bare sha1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1249
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1250
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1251
*** t1402-check-ref-format.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1252
ok 1 - ref name '' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1253
ok 2 - ref name '/' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1254
ok 3 - ref name '/' is invalid with options --allow-onelevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1255
ok 4 - ref name '/' is invalid with options --normalize
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1256
ok 5 - ref name '/' is invalid with options --allow-onelevel --normalize
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1257
ok 6 - ref name 'foo/bar/baz' is valid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1258
ok 7 - ref name 'foo/bar/baz' is valid with options --normalize
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1259
ok 8 - ref name 'refs///heads/foo' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1260
ok 9 - ref name 'refs///heads/foo' is valid with options --normalize
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1261
ok 10 - ref name 'heads/foo/' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1262
ok 11 - ref name '/heads/foo' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1263
ok 12 - ref name '/heads/foo' is valid with options --normalize
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1264
ok 13 - ref name '///heads/foo' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1265
ok 14 - ref name '///heads/foo' is valid with options --normalize
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1266
ok 15 - ref name './foo' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1267
ok 16 - ref name './foo/bar' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1268
ok 17 - ref name 'foo/./bar' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1269
ok 18 - ref name 'foo/bar/.' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1270
ok 19 - ref name '.refs/foo' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1271
ok 20 - ref name 'heads/foo..bar' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1272
ok 21 - ref name 'heads/foo?bar' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1273
ok 22 - ref name 'foo./bar' is valid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1274
ok 23 - ref name 'heads/foo.lock' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1275
ok 24 - ref name 'heads///foo.lock' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1276
ok 25 - ref name 'foo.lock/bar' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1277
ok 26 - ref name 'foo.lock///bar' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1278
ok 27 - ref name 'heads/foo@bar' is valid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1279
ok 28 - ref name 'heads/v@{ation' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1280
ok 29 - ref name 'heads/fooar' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1281
ok 30 - ref name 'heads/foo	' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1282
ok 31 - ref name 'heads/foo' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1283
ok 32 - ref name 'heads/fuß' is valid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1284
ok 33 - ref name 'heads/*foo/bar' is invalid with options --refspec-pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1285
ok 34 - ref name 'heads/foo*/bar' is invalid with options --refspec-pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1286
ok 35 - ref name 'heads/f*o/bar' is invalid with options --refspec-pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1287
ok 36 - ref name 'foo' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1288
ok 37 - ref name 'foo' is valid with options --allow-onelevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1289
ok 38 - ref name 'foo' is invalid with options --refspec-pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1290
ok 39 - ref name 'foo' is valid with options --refspec-pattern --allow-onelevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1291
ok 40 - ref name 'foo' is invalid with options --normalize
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1292
ok 41 - ref name 'foo' is valid with options --allow-onelevel --normalize
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1293
ok 42 - ref name 'foo/bar' is valid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1294
ok 43 - ref name 'foo/bar' is valid with options --allow-onelevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1295
ok 44 - ref name 'foo/bar' is valid with options --refspec-pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1296
ok 45 - ref name 'foo/bar' is valid with options --refspec-pattern --allow-onelevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1297
ok 46 - ref name 'foo/bar' is valid with options --normalize
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1298
ok 47 - ref name 'foo/*' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1299
ok 48 - ref name 'foo/*' is invalid with options --allow-onelevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1300
ok 49 - ref name 'foo/*' is valid with options --refspec-pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1301
ok 50 - ref name 'foo/*' is valid with options --refspec-pattern --allow-onelevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1302
ok 51 - ref name '*/foo' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1303
ok 52 - ref name '*/foo' is invalid with options --allow-onelevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1304
ok 53 - ref name '*/foo' is valid with options --refspec-pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1305
ok 54 - ref name '*/foo' is valid with options --refspec-pattern --allow-onelevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1306
ok 55 - ref name '*/foo' is invalid with options --normalize
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1307
ok 56 - ref name '*/foo' is valid with options --refspec-pattern --normalize
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1308
ok 57 - ref name 'foo/*/bar' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1309
ok 58 - ref name 'foo/*/bar' is invalid with options --allow-onelevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1310
ok 59 - ref name 'foo/*/bar' is valid with options --refspec-pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1311
ok 60 - ref name 'foo/*/bar' is valid with options --refspec-pattern --allow-onelevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1312
ok 61 - ref name '*' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1313
ok 62 - ref name '*' is invalid with options --allow-onelevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1314
ok 63 - ref name '*' is invalid with options --refspec-pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1315
ok 64 - ref name '*' is valid with options --refspec-pattern --allow-onelevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1316
ok 65 - ref name 'foo/*/*' is invalid with options --refspec-pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1317
ok 66 - ref name 'foo/*/*' is invalid with options --refspec-pattern --allow-onelevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1318
ok 67 - ref name '*/foo/*' is invalid with options --refspec-pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1319
ok 68 - ref name '*/foo/*' is invalid with options --refspec-pattern --allow-onelevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1320
ok 69 - ref name '*/*/foo' is invalid with options --refspec-pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1321
ok 70 - ref name '*/*/foo' is invalid with options --refspec-pattern --allow-onelevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1322
ok 71 - ref name '/foo' is invalid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1323
ok 72 - ref name '/foo' is invalid with options --allow-onelevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1324
ok 73 - ref name '/foo' is invalid with options --refspec-pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1325
ok 74 - ref name '/foo' is invalid with options --refspec-pattern --allow-onelevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1326
ok 75 - ref name '/foo' is invalid with options --normalize
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1327
ok 76 - ref name '/foo' is valid with options --allow-onelevel --normalize
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1328
ok 77 - ref name '/foo' is invalid with options --refspec-pattern --normalize
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1329
ok 78 - ref name '/foo' is valid with options --refspec-pattern --allow-onelevel --normalize
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1330
ok 79 - check-ref-format --branch @{-1}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1331
ok 80 - check-ref-format --branch from subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1332
ok 81 - ref name 'heads/foo' simplifies to 'heads/foo'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1333
ok 82 - ref name 'refs///heads/foo' simplifies to 'refs/heads/foo'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1334
ok 83 - ref name '/heads/foo' simplifies to 'heads/foo'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1335
ok 84 - ref name '///heads/foo' simplifies to 'heads/foo'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1336
ok 85 - check-ref-format --normalize rejects 'foo'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1337
ok 86 - check-ref-format --normalize rejects '/foo'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1338
ok 87 - check-ref-format --normalize rejects 'heads/foo/../bar'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1339
ok 88 - check-ref-format --normalize rejects 'heads/./foo'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1340
ok 89 - check-ref-format --normalize rejects 'headsoo'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1341
ok 90 - check-ref-format --normalize rejects 'heads/foo.lock'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1342
ok 91 - check-ref-format --normalize rejects 'heads///foo.lock'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1343
ok 92 - check-ref-format --normalize rejects 'foo.lock/bar'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1344
ok 93 - check-ref-format --normalize rejects 'foo.lock///bar'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1345
# passed all 93 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1346
1..93
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1347
*** t1410-reflog.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1348
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1349
ok 2 - rewind
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1350
ok 3 - corrupt and check
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1351
ok 4 - reflog expire --dry-run should not touch reflog
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1352
ok 5 - reflog expire
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1353
ok 6 - prune and fsck
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1354
ok 7 - recover and check
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1355
ok 8 - delete
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1356
ok 9 - rewind2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1357
ok 10 - --expire=never
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1358
ok 11 - gc.reflogexpire=never
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1359
ok 12 - gc.reflogexpire=false
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1360
# passed all 12 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1361
1..12
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1362
*** t1411-reflog-show.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1363
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1364
ok 2 - log -g shows reflog headers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1365
ok 3 - oneline reflog format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1366
ok 4 - reflog default format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1367
ok 5 - override reflog default format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1368
ok 6 - using @{now} syntax shows reflog date (multiline)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1369
ok 7 - using @{now} syntax shows reflog date (oneline)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1370
ok 8 - using --date= shows reflog date (multiline)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1371
ok 9 - using --date= shows reflog date (oneline)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1372
ok 10 - empty reflog file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1373
# passed all 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1374
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1375
*** t1412-reflog-loop.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1376
ok 1 - setup commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1377
ok 2 - setup reflog with alternating commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1378
ok 3 - reflog shows all entries
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1379
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1380
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1381
*** t1420-lost-found.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1382
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1383
ok 2 - lost and found something
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1384
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1385
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1386
*** t1450-fsck.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1387
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1388
ok 2 - loose objects borrowed from alternate are not missing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1389
ok 3 - HEAD is part of refs, valid objects appear valid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1390
ok 4 - setup: helpers for corruption tests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1391
ok 5 - object with bad sha1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1392
ok 6 - branch pointing to non-commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1393
ok 7 - email without @ is okay
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1394
ok 8 - email with embedded > is not okay
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1395
ok 9 - missing < email delimiter is reported nicely
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1396
ok 10 - missing email is reported nicely
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1397
ok 11 - > in name is reported
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1398
ok 12 - tag pointing to nonexistent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1399
ok 13 - tag pointing to something else than its type
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1400
ok 14 - cleaned up
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1401
ok 15 - rev-list --verify-objects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1402
ok 16 - rev-list --verify-objects with bad sha1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1403
# passed all 16 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1404
1..16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1405
*** t1500-rev-parse.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1406
ok 1 - toplevel: is-bare-repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1407
ok 2 - toplevel: is-inside-git-dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1408
ok 3 - toplevel: is-inside-work-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1409
ok 4 - toplevel: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1410
ok 5 - toplevel: git-dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1411
ok 6 - .git/: is-bare-repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1412
ok 7 - .git/: is-inside-git-dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1413
ok 8 - .git/: is-inside-work-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1414
ok 9 - .git/: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1415
ok 10 - .git/: git-dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1416
ok 11 - .git/objects/: is-bare-repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1417
ok 12 - .git/objects/: is-inside-git-dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1418
ok 13 - .git/objects/: is-inside-work-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1419
ok 14 - .git/objects/: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1420
ok 15 - .git/objects/: git-dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1421
ok 16 - subdirectory: is-bare-repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1422
ok 17 - subdirectory: is-inside-git-dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1423
ok 18 - subdirectory: is-inside-work-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1424
ok 19 - subdirectory: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1425
ok 20 - subdirectory: git-dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1426
ok 21 - core.bare = true: is-bare-repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1427
ok 22 - core.bare = true: is-inside-git-dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1428
ok 23 - core.bare = true: is-inside-work-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1429
ok 24 - core.bare undefined: is-bare-repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1430
ok 25 - core.bare undefined: is-inside-git-dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1431
ok 26 - core.bare undefined: is-inside-work-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1432
ok 27 - GIT_DIR=../.git, core.bare = false: is-bare-repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1433
ok 28 - GIT_DIR=../.git, core.bare = false: is-inside-git-dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1434
ok 29 - GIT_DIR=../.git, core.bare = false: is-inside-work-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1435
ok 30 - GIT_DIR=../.git, core.bare = false: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1436
ok 31 - GIT_DIR=../.git, core.bare = true: is-bare-repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1437
ok 32 - GIT_DIR=../.git, core.bare = true: is-inside-git-dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1438
ok 33 - GIT_DIR=../.git, core.bare = true: is-inside-work-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1439
ok 34 - GIT_DIR=../.git, core.bare = true: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1440
ok 35 - GIT_DIR=../.git, core.bare undefined: is-bare-repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1441
ok 36 - GIT_DIR=../.git, core.bare undefined: is-inside-git-dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1442
ok 37 - GIT_DIR=../.git, core.bare undefined: is-inside-work-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1443
ok 38 - GIT_DIR=../.git, core.bare undefined: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1444
ok 39 - GIT_DIR=../repo.git, core.bare = false: is-bare-repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1445
ok 40 - GIT_DIR=../repo.git, core.bare = false: is-inside-git-dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1446
ok 41 - GIT_DIR=../repo.git, core.bare = false: is-inside-work-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1447
ok 42 - GIT_DIR=../repo.git, core.bare = false: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1448
ok 43 - GIT_DIR=../repo.git, core.bare = true: is-bare-repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1449
ok 44 - GIT_DIR=../repo.git, core.bare = true: is-inside-git-dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1450
ok 45 - GIT_DIR=../repo.git, core.bare = true: is-inside-work-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1451
ok 46 - GIT_DIR=../repo.git, core.bare = true: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1452
ok 47 - GIT_DIR=../repo.git, core.bare undefined: is-bare-repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1453
ok 48 - GIT_DIR=../repo.git, core.bare undefined: is-inside-git-dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1454
ok 49 - GIT_DIR=../repo.git, core.bare undefined: is-inside-work-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1455
ok 50 - GIT_DIR=../repo.git, core.bare undefined: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1456
# passed all 50 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1457
1..50
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1458
*** t1501-worktree.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1459
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1460
ok 2 - setup: helper for testing rev-parse
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1461
ok 3 - setup: core.worktree = relative path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1462
ok 4 - outside
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1463
ok 5 - inside work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1464
not ok 6 - empty prefix is actually written out # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1465
ok 7 - subdir of work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1466
ok 8 - setup: core.worktree = absolute path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1467
ok 9 - outside
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1468
ok 10 - inside work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1469
ok 11 - subdir of work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1470
ok 12 - setup: GIT_WORK_TREE=relative (override core.worktree)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1471
ok 13 - outside
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1472
ok 14 - inside work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1473
ok 15 - subdir of work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1474
ok 16 - setup: GIT_WORK_TREE=absolute, below git dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1475
ok 17 - outside
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1476
ok 18 - in repo.git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1477
ok 19 - inside work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1478
ok 20 - subdir of work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1479
ok 21 - find work tree from repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1480
ok 22 - find work tree from work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1481
ok 23 - _gently() groks relative GIT_DIR & GIT_WORK_TREE
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1482
ok 24 - diff-index respects work tree under .git dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1483
ok 25 - diff-files respects work tree under .git dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1484
ok 26 - git diff respects work tree under .git dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1485
ok 27 - git grep
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1486
ok 28 - git commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1487
ok 29 - absolute pathspec should fail gracefully
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1488
ok 30 - make_relative_path handles double slashes in GIT_DIR
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1489
ok 31 - relative $GIT_WORK_TREE and git subprocesses
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1490
# still have 1 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1491
# passed all remaining 30 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1492
1..31
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1493
*** t1502-rev-parse-parseopt.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1494
ok 1 - test --parseopt help output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1495
ok 2 - test --parseopt
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1496
ok 3 - test --parseopt with mixed options and arguments
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1497
ok 4 - test --parseopt with --
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1498
ok 5 - test --parseopt --stop-at-non-option
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1499
ok 6 - test --parseopt --keep-dashdash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1500
ok 7 - test --parseopt --keep-dashdash --stop-at-non-option with --
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1501
ok 8 - test --parseopt --keep-dashdash --stop-at-non-option without --
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1502
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1503
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1504
*** t1503-rev-parse-verify.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1505
ok 1 - set up basic repo with 1 file (hello) and 4 commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1506
ok 2 - works with one good rev
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1507
ok 3 - fails with any bad rev or many good revs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1508
ok 4 - fails silently when using -q
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1509
ok 5 - no stdout output on error
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1510
ok 6 - use --default
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1511
ok 7 - master@{n} for various n
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1512
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1513
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1514
*** t1504-ceiling-dirs.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1515
ok 1 - no_ceil
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1516
ok 2 - ceil_empty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1517
ok 3 - ceil_at_parent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1518
ok 4 - ceil_at_parent_slash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1519
ok 5 - ceil_at_trash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1520
ok 6 - ceil_at_trash_slash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1521
ok 7 - ceil_at_sub
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1522
ok 8 - ceil_at_sub_slash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1523
ok 9 - subdir_no_ceil
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1524
ok 10 - subdir_ceil_empty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1525
ok 11 - subdir_ceil_at_trash: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1526
ok 12 - subdir_ceil_at_trash_slash: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1527
ok 13 - subdir_ceil_at_sub: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1528
ok 14 - subdir_ceil_at_sub_slash: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1529
ok 15 - subdir_ceil_at_subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1530
ok 16 - subdir_ceil_at_subdir_slash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1531
ok 17 - subdir_ceil_at_su
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1532
ok 18 - subdir_ceil_at_su_slash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1533
ok 19 - subdir_ceil_at_sub_di
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1534
ok 20 - subdir_ceil_at_sub_di_slash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1535
ok 21 - subdir_ceil_at_subdi
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1536
ok 22 - subdir_ceil_at_subdi_slash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1537
ok 23 - second_of_two: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1538
ok 24 - first_of_two: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1539
ok 25 - second_of_three: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1540
ok 26 - git_dir_specified
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1541
ok 27 - sd_no_ceil
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1542
ok 28 - sd_ceil_empty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1543
ok 29 - sd_ceil_at_trash: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1544
ok 30 - sd_ceil_at_trash_slash: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1545
ok 31 - sd_ceil_at_s: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1546
ok 32 - sd_ceil_at_s_slash: prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1547
ok 33 - sd_ceil_at_sd
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1548
ok 34 - sd_ceil_at_sd_slash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1549
ok 35 - sd_ceil_at_su
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1550
ok 36 - sd_ceil_at_su_slash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1551
ok 37 - sd_ceil_at_s_di
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1552
ok 38 - sd_ceil_at_s_di_slash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1553
ok 39 - sd_ceil_at_sdi
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1554
ok 40 - sd_ceil_at_sdi_slash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1555
# passed all 40 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1556
1..40
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1557
*** t1505-rev-parse-last.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1558
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1559
ok 2 - @{-1} works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1560
ok 3 - @{-1}~2 works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1561
ok 4 - @{-1}^2 works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1562
ok 5 - @{-1}@{1} works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1563
ok 6 - @{-2} works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1564
ok 7 - @{-3} fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1565
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1566
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1567
*** t1506-rev-parse-diagnosis.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1568
ok 1 - set up basic repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1569
ok 2 - correct file objects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1570
ok 3 - correct relative file objects (0)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1571
ok 4 - correct relative file objects (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1572
ok 5 - correct relative file objects (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1573
ok 6 - correct relative file objects (3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1574
ok 7 - correct relative file objects (4)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1575
ok 8 - correct relative file objects (5)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1576
ok 9 - correct relative file objects (6)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1577
ok 10 - incorrect revision id
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1578
ok 11 - incorrect file in sha1:path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1579
ok 12 - incorrect file in :path and :N:path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1580
ok 13 - invalid @{n} reference
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1581
ok 14 - relative path not found
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1582
ok 15 - relative path outside worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1583
ok 16 - relative path when cwd is outside worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1584
ok 17 - relative path when startup_info is NULL
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1585
# passed all 17 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1586
1..17
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1587
*** t1507-rev-parse-upstream.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1588
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1589
ok 2 - @{upstream} resolves to correct full name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1590
ok 3 - @{u} resolves to correct full name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1591
ok 4 - my-side@{upstream} resolves to correct full name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1592
ok 5 - my-side@{u} resolves to correct commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1593
ok 6 - not-tracking@{u} fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1594
ok 7 - <branch>@{u}@{1} resolves correctly
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1595
ok 8 - @{u} without specifying branch fails on a detached HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1596
ok 9 - checkout -b new my-side@{u} forks from the same
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1597
ok 10 - merge my-side@{u} records the correct name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1598
ok 11 - branch -d other@{u}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1599
ok 12 - checkout other@{u}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1600
ok 13 - log -g other@{u}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1601
ok 14 - log -g other@{u}@{now}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1602
# passed all 14 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1603
1..14
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1604
*** t1508-at-combinations.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1605
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1606
ok 2 - HEAD = new-two
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1607
ok 3 - @{1} = new-one
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1608
ok 4 - @{-1} = old-two
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1609
ok 5 - @{-1}@{1} = old-one
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1610
ok 6 - @{u} = upstream-two
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1611
ok 7 - @{u}@{1} = upstream-one
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1612
ok 8 - @{-1}@{u} = master-two
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1613
ok 9 - @{-1}@{u}@{1} = master-one
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1614
ok 10 - @{u}@{-1} is nonsensical
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1615
ok 11 - @{1}@{u} is nonsensical
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1616
# passed all 11 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1617
1..11
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1618
*** t1509-root-worktree.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1619
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1620
1..0 # SKIP Dangerous test skipped. Read this test if you want to execute it
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1621
*** t1510-repo-setup.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1622
ok 1 - #0: nonbare repo, no explicit configuration
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1623
ok 2 - #1: GIT_WORK_TREE without explicit GIT_DIR is accepted
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1624
ok 3 - #2: worktree defaults to cwd with explicit GIT_DIR
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1625
ok 4 - #2b: relative GIT_DIR
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1626
ok 5 - #3: setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1627
ok 6 - #3: explicit GIT_WORK_TREE and GIT_DIR at toplevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1628
ok 7 - #3: explicit GIT_WORK_TREE and GIT_DIR in subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1629
ok 8 - #3: explicit GIT_WORK_TREE from parent of worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1630
ok 9 - #3: explicit GIT_WORK_TREE from nephew of worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1631
ok 10 - #3: chdir_to_toplevel uses worktree, not git dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1632
ok 11 - #3: chdir_to_toplevel uses worktree (from subdir)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1633
ok 12 - #4: core.worktree without GIT_DIR set is accepted
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1634
ok 13 - #5: core.worktree + GIT_WORK_TREE is accepted
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1635
ok 14 - #6: setting GIT_DIR brings core.worktree to life
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1636
ok 15 - #6b: GIT_DIR set, core.worktree relative
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1637
ok 16 - #6c: GIT_DIR set, core.worktree=../wt (absolute)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1638
ok 17 - #6d: GIT_DIR set, core.worktree=../wt (relative)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1639
ok 18 - #6e: GIT_DIR set, core.worktree=../.. (absolute)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1640
ok 19 - #6f: GIT_DIR set, core.worktree=../.. (relative)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1641
ok 20 - #7: setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1642
ok 21 - #7: explicit GIT_WORK_TREE and GIT_DIR at toplevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1643
ok 22 - #7: explicit GIT_WORK_TREE and GIT_DIR in subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1644
ok 23 - #7: explicit GIT_WORK_TREE from parent of worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1645
ok 24 - #7: explicit GIT_WORK_TREE from nephew of worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1646
ok 25 - #7: chdir_to_toplevel uses worktree, not git dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1647
ok 26 - #7: chdir_to_toplevel uses worktree (from subdir)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1648
ok 27 - #8: gitfile, easy case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1649
ok 28 - #9: GIT_WORK_TREE accepted with gitfile
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1650
ok 29 - #10: GIT_DIR can point to gitfile
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1651
ok 30 - #10b: relative GIT_DIR can point to gitfile
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1652
ok 31 - #11: setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1653
ok 32 - #11: explicit GIT_WORK_TREE and GIT_DIR at toplevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1654
ok 33 - #11: explicit GIT_WORK_TREE and GIT_DIR in subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1655
ok 34 - #11: explicit GIT_WORK_TREE from parent of worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1656
ok 35 - #11: explicit GIT_WORK_TREE from nephew of worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1657
ok 36 - #11: chdir_to_toplevel uses worktree, not git dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1658
ok 37 - #11: chdir_to_toplevel uses worktree (from subdir)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1659
ok 38 - #12: core.worktree with gitfile is accepted
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1660
ok 39 - #13: core.worktree+GIT_WORK_TREE accepted (with gitfile)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1661
ok 40 - #14: core.worktree with GIT_DIR pointing to gitfile
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1662
ok 41 - #14b: core.worktree is relative to actual git dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1663
ok 42 - #15: setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1664
ok 43 - #15: explicit GIT_WORK_TREE and GIT_DIR at toplevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1665
ok 44 - #15: explicit GIT_WORK_TREE and GIT_DIR in subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1666
ok 45 - #15: explicit GIT_WORK_TREE from parent of worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1667
ok 46 - #15: explicit GIT_WORK_TREE from nephew of worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1668
ok 47 - #15: chdir_to_toplevel uses worktree, not git dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1669
ok 48 - #15: chdir_to_toplevel uses worktree (from subdir)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1670
ok 49 - #16a: implicitly bare repo (cwd inside .git dir)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1671
ok 50 - #16b: bare .git (cwd inside .git dir)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1672
ok 51 - #16c: bare .git has no worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1673
ok 52 - #17: GIT_WORK_TREE without explicit GIT_DIR is accepted (bare case)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1674
ok 53 - #18: bare .git named by GIT_DIR has no worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1675
ok 54 - #19: setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1676
ok 55 - #19: explicit GIT_WORK_TREE and GIT_DIR at toplevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1677
ok 56 - #19: explicit GIT_WORK_TREE and GIT_DIR in subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1678
ok 57 - #19: explicit GIT_WORK_TREE from parent of worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1679
ok 58 - #19: explicit GIT_WORK_TREE from nephew of worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1680
ok 59 - #19: chdir_to_toplevel uses worktree, not git dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1681
ok 60 - #19: chdir_to_toplevel uses worktree (from subdir)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1682
ok 61 - #20a: core.worktree without GIT_DIR accepted (inside .git)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1683
ok 62 - #20b/c: core.worktree and core.bare conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1684
ok 63 - #21: setup, core.worktree warns before overriding core.bare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1685
ok 64 - #21: explicit GIT_WORK_TREE and GIT_DIR at toplevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1686
ok 65 - #21: explicit GIT_WORK_TREE and GIT_DIR in subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1687
ok 66 - #21: explicit GIT_WORK_TREE from parent of worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1688
ok 67 - #21: explicit GIT_WORK_TREE from nephew of worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1689
ok 68 - #21: chdir_to_toplevel uses worktree, not git dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1690
ok 69 - #21: chdir_to_toplevel uses worktree (from subdir)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1691
ok 70 - #22a: core.worktree = GIT_DIR = .git dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1692
ok 71 - #22b: core.worktree child of .git, GIT_DIR=.git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1693
ok 72 - #22c: core.worktree = .git/.., GIT_DIR=.git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1694
ok 73 - #22.2: core.worktree and core.bare conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1695
ok 74 - #23: setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1696
ok 75 - #23: explicit GIT_WORK_TREE and GIT_DIR at toplevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1697
ok 76 - #23: explicit GIT_WORK_TREE and GIT_DIR in subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1698
ok 77 - #23: explicit GIT_WORK_TREE from parent of worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1699
ok 78 - #23: explicit GIT_WORK_TREE from nephew of worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1700
ok 79 - #23: chdir_to_toplevel uses worktree, not git dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1701
ok 80 - #23: chdir_to_toplevel uses worktree (from subdir)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1702
ok 81 - #24: bare repo has no worktree (gitfile case)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1703
ok 82 - #25: GIT_WORK_TREE accepted if GIT_DIR unset (bare gitfile case)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1704
ok 83 - #26: bare repo has no worktree (GIT_DIR -> gitfile case)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1705
ok 84 - #27: setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1706
ok 85 - #27: explicit GIT_WORK_TREE and GIT_DIR at toplevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1707
ok 86 - #27: explicit GIT_WORK_TREE and GIT_DIR in subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1708
ok 87 - #27: explicit GIT_WORK_TREE from parent of worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1709
ok 88 - #27: explicit GIT_WORK_TREE from nephew of worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1710
ok 89 - #27: chdir_to_toplevel uses worktree, not git dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1711
ok 90 - #27: chdir_to_toplevel uses worktree (from subdir)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1712
ok 91 - #28: core.worktree and core.bare conflict (gitfile case)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1713
ok 92 - #29: setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1714
ok 93 - #29: explicit GIT_WORK_TREE and GIT_DIR at toplevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1715
ok 94 - #29: explicit GIT_WORK_TREE and GIT_DIR in subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1716
ok 95 - #29: explicit GIT_WORK_TREE from parent of worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1717
ok 96 - #29: explicit GIT_WORK_TREE from nephew of worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1718
ok 97 - #29: chdir_to_toplevel uses worktree, not git dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1719
ok 98 - #29: chdir_to_toplevel uses worktree (from subdir)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1720
ok 99 - #30: core.worktree and core.bare conflict (gitfile version)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1721
ok 100 - #31: setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1722
ok 101 - #31: explicit GIT_WORK_TREE and GIT_DIR at toplevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1723
ok 102 - #31: explicit GIT_WORK_TREE and GIT_DIR in subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1724
ok 103 - #31: explicit GIT_WORK_TREE from parent of worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1725
ok 104 - #31: explicit GIT_WORK_TREE from nephew of worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1726
ok 105 - #31: chdir_to_toplevel uses worktree, not git dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1727
ok 106 - #31: chdir_to_toplevel uses worktree (from subdir)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1728
# passed all 106 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1729
1..106
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1730
*** t1511-rev-parse-caret.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1731
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1732
ok 2 - ref^{non-existent}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1733
ok 3 - ref^{}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1734
ok 4 - ref^{commit}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1735
ok 5 - ref^{tree}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1736
ok 6 - ref^{/.}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1737
ok 7 - ref^{/non-existent}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1738
ok 8 - ref^{/Initial}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1739
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1740
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1741
*** t2000-checkout-cache-clash.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1742
ok 1 - git update-index --add various paths.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1743
ok 2 - git checkout-index without -f should fail on conflicting work tree.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1744
ok 3 - git checkout-index with -f should succeed.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1745
ok 4 - git checkout-index conflicting paths.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1746
ok 5 - checkout-index -f twice with --prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1747
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1748
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1749
*** t2001-checkout-cache-clash.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1750
ok 1 - git update-index --add path0/file0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1751
ok 2 - writing tree out with git write-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1752
ok 3 - git update-index --add path1/file1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1753
ok 4 - writing tree out with git write-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1754
ok 5 - read previously written tree and checkout.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1755
ok 6 - git update-index --add a symlink.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1756
ok 7 - writing tree out with git write-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1757
ok 8 - read previously written tree and checkout.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1758
ok 9 - checking out conflicting path with -f
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1759
# passed all 9 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1760
1..9
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1761
*** t2002-checkout-cache-u.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1762
ok 1 - preparation
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1763
ok 2 - without -u, git checkout-index smudges stat information.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1764
ok 3 - with -u, git checkout-index picks up stat information from new files.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1765
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1766
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1767
*** t2003-checkout-cache-mkdir.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1768
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1769
ok 2 - have symlink in place where dir is expected.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1770
ok 3 - use --prefix=path2/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1771
ok 4 - use --prefix=tmp-
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1772
ok 5 - use --prefix=tmp- but with a conflicting file and dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1773
ok 6 - use --prefix=tmp/orary/ where tmp is a symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1774
ok 7 - use --prefix=tmp/orary- where tmp is a symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1775
ok 8 - use --prefix=tmp- where tmp-path1 is a symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1776
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1777
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1778
*** t2004-checkout-cache-temp.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1779
ok 1 - preparation
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1780
ok 2 - checkout one stage 0 to temporary file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1781
ok 3 - checkout all stage 0 to temporary files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1782
ok 4 - prepare 3-way merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1783
ok 5 - checkout one stage 2 to temporary file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1784
ok 6 - checkout all stage 2 to temporary files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1785
ok 7 - checkout all stages/one file to nothing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1786
ok 8 - checkout all stages/one file to temporary files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1787
ok 9 - checkout some stages/one file to temporary files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1788
ok 10 - checkout all stages/all files to temporary files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1789
ok 11 - -- path0: no entry
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1790
ok 12 - -- path1: all 3 stages
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1791
ok 13 - -- path2: no stage 1, have stage 2 and 3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1792
ok 14 - -- path3: no stage 2, have stage 1 and 3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1793
ok 15 - -- path4: no stage 3, have stage 1 and 3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1794
ok 16 - -- asubdir/path5: no stage 2 and 3 have stage 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1795
ok 17 - checkout --temp within subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1796
ok 18 - checkout --temp symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1797
# passed all 18 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1798
1..18
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1799
*** t2005-checkout-index-symlinks.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1800
ok 1 - preparation
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1801
ok 2 - the checked-out symlink must be a file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1802
ok 3 - the file must be the blob we added during the setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1803
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1804
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1805
*** t2006-checkout-index-basic.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1806
ok 1 - checkout-index --gobbledegook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1807
ok 2 - checkout-index -h in broken repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1808
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1809
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1810
*** t2007-checkout-symlink.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1811
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1812
ok 2 - switch from symlink to dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1813
ok 3 - Remove temporary directories & switch to master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1814
ok 4 - switch from dir to symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1815
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1816
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1817
*** t2008-checkout-subdir.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1818
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1819
ok 2 - remove and restore with relative path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1820
ok 3 - checkout with empty prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1821
ok 4 - checkout with simple prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1822
ok 5 - relative path outside tree should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1823
ok 6 - incorrect relative path to file should fail (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1824
ok 7 - incorrect relative path should fail (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1825
ok 8 - incorrect relative path should fail (3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1826
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1827
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1828
*** t2009-checkout-statinfo.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1829
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1830
ok 2 - branch switching
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1831
ok 3 - path checkout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1832
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1833
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1834
*** t2010-checkout-ambiguous.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1835
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1836
ok 2 - reference must be a tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1837
ok 3 - branch switching
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1838
ok 4 - checkout world from the index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1839
ok 5 - non ambiguous call
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1840
ok 6 - allow the most common case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1841
ok 7 - check ambiguity
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1842
ok 8 - disambiguate checking out from a tree-ish
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1843
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1844
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1845
*** t2011-checkout-invalid-head.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1846
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1847
ok 2 - checkout should not start branch from a tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1848
ok 3 - checkout master from invalid HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1849
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1850
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1851
*** t2012-checkout-last.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1852
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1853
ok 2 - "checkout -" does not work initially
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1854
ok 3 - first branch switch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1855
ok 4 - "checkout -" switches back
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1856
ok 5 - "checkout -" switches forth
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1857
ok 6 - detach HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1858
ok 7 - "checkout -" attaches again
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1859
ok 8 - "checkout -" detaches again
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1860
ok 9 - more switches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1861
ok 10 - switch to the last
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1862
ok 11 - switch to second from the last
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1863
ok 12 - switch to third from the last
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1864
ok 13 - switch to fourth from the last
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1865
ok 14 - switch to twelfth from the last
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1866
ok 15 - merge base test setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1867
ok 16 - another...master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1868
ok 17 - ...master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1869
ok 18 - master...
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1870
# passed all 18 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1871
1..18
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1872
*** t2013-checkout-submodule.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1873
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1874
ok 2 - "reset <submodule>" updates the index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1875
ok 3 - "checkout <submodule>" updates the index only
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1876
ok 4 - "checkout <submodule>" honors diff.ignoreSubmodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1877
ok 5 - "checkout <submodule>" honors submodule.*.ignore from .gitmodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1878
ok 6 - "checkout <submodule>" honors submodule.*.ignore from .git/config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1879
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1880
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1881
*** t2014-switch.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1882
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1883
ok 2 - check all changes are staged
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1884
ok 3 - second commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1885
ok 4 - check
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1886
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1887
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1888
*** t2015-checkout-unborn.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1889
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1890
ok 2 - checkout from unborn preserves untracked files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1891
ok 3 - checkout from unborn preserves index contents
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1892
ok 4 - checkout from unborn merges identical index contents
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1893
ok 5 - checking out another branch from unborn state
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1894
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1895
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1896
*** t2016-checkout-patch.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1897
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1898
ok 2 - saying "n" does nothing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1899
ok 3 - git checkout -p
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1900
ok 4 - git checkout -p with staged changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1901
ok 5 - git checkout -p HEAD with NO staged changes: abort
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1902
ok 6 - git checkout -p HEAD with NO staged changes: apply
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1903
ok 7 - git checkout -p HEAD with change already staged
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1904
ok 8 - git checkout -p HEAD^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1905
ok 9 - git checkout -p handles deletion
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1906
ok 10 - path limiting works: dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1907
ok 11 - path limiting works: -- dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1908
ok 12 - path limiting works: HEAD^ -- dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1909
ok 13 - path limiting works: foo inside dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1910
ok 14 - none of this moved HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1911
# passed all 14 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1912
1..14
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1913
*** t2017-checkout-orphan.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1914
ok 1 - Setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1915
ok 2 - --orphan creates a new orphan branch from HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1916
ok 3 - --orphan creates a new orphan branch from <start_point>
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1917
ok 4 - --orphan must be rejected with -b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1918
ok 5 - --orphan must be rejected with -t
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1919
ok 6 - --orphan ignores branch.autosetupmerge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1920
ok 7 - --orphan makes reflog by default
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1921
ok 8 - --orphan does not make reflog when core.logAllRefUpdates = false
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1922
ok 9 - --orphan with -l makes reflog when core.logAllRefUpdates = false
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1923
ok 10 - giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1924
ok 11 - --orphan is rejected with an existing name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1925
ok 12 - --orphan refuses to switch if a merge is needed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1926
# passed all 12 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1927
1..12
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1928
*** t2018-checkout-branch.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1929
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1930
ok 2 - checkout -b to a new branch, set to HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1931
ok 3 - checkout -b to a new branch, set to an explicit ref
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1932
ok 4 - checkout -b to a new branch with unmergeable changes fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1933
ok 5 - checkout -f -b to a new branch with unmergeable changes discards changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1934
ok 6 - checkout -b to a new branch preserves mergeable changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1935
ok 7 - checkout -f -b to a new branch with mergeable changes discards changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1936
ok 8 - checkout -b to an existing branch fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1937
ok 9 - checkout -b to @{-1} fails with the right branch name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1938
ok 10 - checkout -B to an existing branch resets branch to HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1939
ok 11 - checkout -B to an existing branch from detached HEAD resets branch to HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1940
ok 12 - checkout -B to an existing branch with an explicit ref resets branch to that ref
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1941
ok 13 - checkout -B to an existing branch with unmergeable changes fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1942
ok 14 - checkout -f -B to an existing branch with unmergeable changes discards changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1943
ok 15 - checkout -B to an existing branch preserves mergeable changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1944
ok 16 - checkout -f -B to an existing branch with mergeable changes discards changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1945
ok 17 - checkout -b <describe>
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1946
ok 18 - checkout -B to the current branch works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1947
# passed all 18 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1948
1..18
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1949
*** t2019-checkout-ambiguous-ref.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1950
ok 1 - setup ambiguous refs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1951
ok 2 - checkout ambiguous ref succeeds
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1952
ok 3 - checkout produces ambiguity warning
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1953
ok 4 - checkout chooses branch over tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1954
ok 5 - checkout reports switch to branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1955
ok 6 - checkout vague ref succeeds
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1956
ok 7 - checkout produces ambiguity warning
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1957
ok 8 - checkout chooses branch over tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1958
ok 9 - checkout reports switch to branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1959
# passed all 9 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1960
1..9
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1961
*** t2020-checkout-detach.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1962
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1963
ok 2 - checkout branch does not detach
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1964
ok 3 - checkout tag detaches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1965
ok 4 - checkout branch by full name detaches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1966
ok 5 - checkout non-ref detaches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1967
ok 6 - checkout ref^0 detaches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1968
ok 7 - checkout --detach detaches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1969
ok 8 - checkout --detach without branch name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1970
ok 9 - checkout --detach errors out for non-commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1971
ok 10 - checkout --detach errors out for extra argument
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1972
ok 11 - checkout --detached and -b are incompatible
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1973
ok 12 - checkout --detach moves HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1974
ok 13 - checkout warns on orphan commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1975
ok 14 - checkout warns on orphan commits: output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1976
ok 15 - checkout does not warn leaving ref tip
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1977
ok 16 - checkout does not warn leaving ref tip
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1978
ok 17 - checkout does not warn leaving reachable commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1979
ok 18 - checkout does not warn leaving reachable commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1980
ok 19 - tracking count is accurate after orphan check
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1981
# passed all 19 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1982
1..19
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1983
*** t2021-checkout-overwrite.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1984
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1985
ok 2 - create a commit where dir a/b changed to file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1986
ok 3 - checkout commit with dir must not remove untracked a/b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1987
ok 4 - create a commit where dir a/b changed to symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1988
ok 5 - checkout commit with dir must not remove untracked a/b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1989
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1990
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1991
*** t2022-checkout-paths.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1992
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1993
ok 2 - checking out paths out of a tree does not clobber unrelated paths
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1994
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1995
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1996
*** t2023-checkout-m.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1997
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1998
ok 2 - git merge master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  1999
ok 3 - -m restores 2-way conflicted+resolved file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2000
ok 4 - -m restores 3-way conflicted+resolved file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2001
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2002
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2003
*** t2030-unresolve-info.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2004
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2005
ok 2 - add records switch clears
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2006
ok 3 - rm records reset clears
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2007
ok 4 - plumbing clears
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2008
ok 5 - add records checkout -m undoes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2009
ok 6 - unmerge with plumbing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2010
ok 7 - rerere and rerere forget
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2011
ok 8 - rerere and rerere forget (subdirectory)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2012
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2013
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2014
*** t2050-git-dir-relative.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2015
ok 1 - Setting up post-commit hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2016
ok 2 - post-commit hook used ordinarily
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2017
ok 3 - post-commit-hook created and used from top dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2018
ok 4 - post-commit-hook from sub dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2019
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2020
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2021
*** t2100-update-cache-badpath.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2022
ok 1 - git update-index --add to add various paths.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2023
ok 2 - git update-index to add conflicting path path0/file0 should fail.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2024
ok 3 - git update-index to add conflicting path path1/file1 should fail.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2025
ok 4 - git update-index to add conflicting path path2 should fail.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2026
ok 5 - git update-index to add conflicting path path3 should fail.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2027
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2028
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2029
*** t2101-update-index-reupdate.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2030
ok 1 - update-index --add
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2031
ok 2 - update-index --again
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2032
ok 3 - update-index --remove --again
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2033
ok 4 - first commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2034
ok 5 - update-index again
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2035
ok 6 - update-index --update from subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2036
ok 7 - update-index --update with pathspec
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2037
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2038
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2039
*** t2102-update-index-symlinks.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2040
ok 1 - preparation
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2041
ok 2 - modify the symbolic link
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2042
ok 3 - the index entry must still be a symbolic link
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2043
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2044
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2045
*** t2103-update-index-ignore-missing.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2046
ok 1 - basics
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2047
ok 2 - --ignore-missing --refresh
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2048
ok 3 - --unmerged --refresh
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2049
ok 4 - --ignore-submodules --refresh (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2050
ok 5 - --ignore-submodules --refresh (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2051
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2052
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2053
*** t2104-update-index-skip-worktree.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2054
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2055
ok 2 - index is at version 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2056
ok 3 - update-index --skip-worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2057
ok 4 - index is at version 3 after having some skip-worktree entries
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2058
ok 5 - ls-files -t
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2059
ok 6 - update-index --no-skip-worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2060
ok 7 - index version is back to 2 when there is no skip-worktree entry
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2061
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2062
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2063
*** t2105-update-index-gitfile.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2064
ok 1 - submodule with absolute .git file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2065
ok 2 - add gitlink to absolute .git file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2066
ok 3 - submodule with relative .git file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2067
ok 4 - add gitlink to relative .git file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2068
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2069
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2070
*** t2106-update-index-assume-unchanged.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2071
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2072
ok 2 - do not switch branches with dirty file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2073
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2074
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2075
*** t2107-update-index-basic.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2076
ok 1 - update-index --nonsense fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2077
ok 2 - update-index --nonsense dumps usage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2078
ok 3 - update-index -h with corrupt index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2079
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2080
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2081
*** t2200-add-update.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2082
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2083
ok 2 - update
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2084
ok 3 - update noticed a removal
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2085
ok 4 - update touched correct path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2086
ok 5 - update did not touch other tracked files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2087
ok 6 - update did not touch untracked files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2088
ok 7 - cache tree has not been corrupted
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2089
ok 8 - update from a subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2090
ok 9 - change gets noticed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2091
ok 10 - replace a file with a symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2092
ok 11 - add everything changed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2093
ok 12 - touch and then add -u
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2094
ok 13 - touch and then add explicitly
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2095
ok 14 - add -n -u should not add but just report
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2096
ok 15 - add -u resolves unmerged paths
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2097
ok 16 - "add -u non-existent" should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2098
# passed all 16 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2099
1..16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2100
*** t2201-add-update-typechange.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2101
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2102
ok 2 - modify
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2103
ok 3 - diff-files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2104
ok 4 - diff-index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2105
ok 5 - add -u
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2106
ok 6 - commit -a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2107
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2108
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2109
*** t2202-add-addremove.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2110
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2111
ok 2 - git add --all
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2112
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2113
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2114
*** t2203-add-intent.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2115
ok 1 - intent to add
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2116
ok 2 - check result of "add -N"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2117
ok 3 - intent to add is just an ordinary empty blob
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2118
ok 4 - intent to add does not clobber existing paths
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2119
ok 5 - i-t-a entry is simply ignored
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2120
ok 6 - can commit with an unrelated i-t-a entry in index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2121
ok 7 - can "commit -a" with an i-t-a entry
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2122
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2123
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2124
*** t2204-add-ignored.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2125
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2126
ok 2 - no complaints for unignored file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2127
ok 3 - no complaints for unignored dir/file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2128
ok 4 - no complaints for unignored dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2129
ok 5 - no complaints for unignored d*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2130
ok 6 - complaints for ignored ign
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2131
ok 7 - complaints for ignored ign output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2132
ok 8 - complaints for ignored ign with unignored file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2133
ok 9 - complaints for ignored ign with unignored file output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2134
ok 10 - complaints for ignored dir/ign
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2135
ok 11 - complaints for ignored dir/ign output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2136
ok 12 - complaints for ignored dir/ign with unignored file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2137
ok 13 - complaints for ignored dir/ign with unignored file output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2138
ok 14 - complaints for ignored dir/sub
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2139
ok 15 - complaints for ignored dir/sub output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2140
ok 16 - complaints for ignored dir/sub with unignored file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2141
ok 17 - complaints for ignored dir/sub with unignored file output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2142
ok 18 - complaints for ignored dir/sub/ign
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2143
ok 19 - complaints for ignored dir/sub/ign output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2144
ok 20 - complaints for ignored dir/sub/ign with unignored file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2145
ok 21 - complaints for ignored dir/sub/ign with unignored file output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2146
ok 22 - complaints for ignored sub/file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2147
ok 23 - complaints for ignored sub/file output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2148
ok 24 - complaints for ignored sub/file with unignored file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2149
ok 25 - complaints for ignored sub/file with unignored file output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2150
ok 26 - complaints for ignored sub
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2151
ok 27 - complaints for ignored sub output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2152
ok 28 - complaints for ignored sub with unignored file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2153
ok 29 - complaints for ignored sub with unignored file output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2154
ok 30 - complaints for ignored sub/file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2155
ok 31 - complaints for ignored sub/file output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2156
ok 32 - complaints for ignored sub/file with unignored file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2157
ok 33 - complaints for ignored sub/file with unignored file output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2158
ok 34 - complaints for ignored sub/ign
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2159
ok 35 - complaints for ignored sub/ign output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2160
ok 36 - complaints for ignored sub/ign with unignored file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2161
ok 37 - complaints for ignored sub/ign with unignored file output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2162
ok 38 - complaints for ignored sub in dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2163
ok 39 - complaints for ignored sub in dir output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2164
ok 40 - complaints for ignored sub/file in dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2165
ok 41 - complaints for ignored sub/file in dir output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2166
ok 42 - complaints for ignored sub/ign in dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2167
ok 43 - complaints for ignored sub/ign in dir output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2168
ok 44 - complaints for ignored ign in sub
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2169
ok 45 - complaints for ignored ign in sub output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2170
ok 46 - complaints for ignored file in sub
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2171
ok 47 - complaints for ignored file in sub output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2172
# passed all 47 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2173
1..47
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2174
*** t2300-cd-to-toplevel.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2175
ok 1 - at physical root
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2176
ok 2 - at physical subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2177
ok 3 - at symbolic root
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2178
ok 4 - at symbolic subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2179
ok 5 - at internal symbolic subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2180
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2181
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2182
*** t3000-ls-files-others.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2183
ok 1 - setup 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2184
ok 2 - setup: expected output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2185
ok 3 - ls-files --others
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2186
ok 4 - ls-files --others --directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2187
ok 5 - --no-empty-directory hides empty directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2188
ok 6 - ls-files --others with symlinked submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2189
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2190
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2191
*** t3001-ls-files-others-exclude.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2192
ok 1 - git ls-files --others with various exclude options.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2193
ok 2 - git ls-files --others with 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2194
 line endings.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2195
ok 3 - setup skip-worktree gitignore
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2196
ok 4 - git ls-files --others with various exclude options.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2197
ok 5 - restore gitignore
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2198
ok 6 - git status honors core.excludesfile
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2199
ok 7 - trailing slash in exclude allows directory match(1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2200
ok 8 - trailing slash in exclude allows directory match (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2201
ok 9 - trailing slash in exclude forces directory match (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2202
ok 10 - trailing slash in exclude forces directory match (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2203
ok 11 - negated exclude matches can override previous ones
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2204
ok 12 - subdirectory ignore (setup)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2205
ok 13 - subdirectory ignore (toplevel)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2206
ok 14 - subdirectory ignore (l1/l2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2207
ok 15 - subdirectory ignore (l1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2208
# passed all 15 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2209
1..15
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2210
*** t3002-ls-files-dashpath.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2211
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2212
ok 2 - git ls-files without path restriction.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2213
ok 3 - git ls-files with path restriction.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2214
ok 4 - git ls-files with path restriction with --.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2215
ok 5 - git ls-files with path restriction with -- --.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2216
ok 6 - git ls-files with no path restriction.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2217
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2218
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2219
*** t3003-ls-files-exclude.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2220
ok 1 - create repo with file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2221
ok 2 - ls-files output contains file (cached)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2222
ok 3 - ls-files output contains file (modified)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2223
ok 4 - add file to gitignore
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2224
ok 5 - ls-files output contains file (cached)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2225
ok 6 - ls-files output contains file (modified)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2226
ok 7 - ls-files -i lists only tracked-but-ignored files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2227
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2228
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2229
*** t3004-ls-files-basic.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2230
ok 1 - ls-files in empty repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2231
ok 2 - ls-files with nonexistent path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2232
ok 3 - ls-files with nonsense option
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2233
ok 4 - ls-files -h in corrupt repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2234
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2235
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2236
*** t3005-ls-files-relative.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2237
ok 1 - prepare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2238
ok 2 - ls-files with mixed levels
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2239
ok 3 - ls-files -c
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2240
ok 4 - ls-files -o
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2241
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2242
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2243
*** t3010-ls-files-killed-modified.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2244
ok 1 - git update-index --add to add various paths.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2245
ok 2 - git ls-files -k to show killed files.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2246
ok 3 - validate git ls-files -k output.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2247
ok 4 - git ls-files -m to show modified files.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2248
ok 5 - validate git ls-files -m output.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2249
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2250
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2251
*** t3020-ls-files-error-unmatch.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2252
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2253
ok 2 - git ls-files --error-unmatch should fail with unmatched path.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2254
ok 3 - git ls-files --error-unmatch should succeed eith matched paths.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2255
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2256
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2257
*** t3030-merge-recursive.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2258
ok 1 - setup 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2259
ok 2 - setup 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2260
ok 3 - setup 3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2261
ok 4 - setup 4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2262
ok 5 - setup 5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2263
ok 6 - setup 6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2264
ok 7 - setup 7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2265
ok 8 - setup 8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2266
ok 9 - setup 9
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2267
ok 10 - merge-recursive simple
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2268
ok 11 - merge-recursive result
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2269
ok 12 - fail if the index has unresolved entries
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2270
ok 13 - merge-recursive remove conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2271
ok 14 - merge-recursive remove conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2272
ok 15 - merge-recursive d/f simple
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2273
ok 16 - merge-recursive result
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2274
ok 17 - merge-recursive d/f conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2275
ok 18 - merge-recursive d/f conflict result
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2276
ok 19 - merge-recursive d/f conflict the other way
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2277
ok 20 - merge-recursive d/f conflict result the other way
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2278
ok 21 - merge-recursive d/f conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2279
ok 22 - merge-recursive d/f conflict result
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2280
ok 23 - merge-recursive d/f conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2281
ok 24 - merge-recursive d/f conflict result
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2282
ok 25 - reset and 3-way merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2283
ok 26 - reset and bind merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2284
ok 27 - merge removes empty directories
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2285
not ok 28 - merge-recursive simple w/submodule # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2286
not ok 29 - merge-recursive simple w/submodule result # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2287
ok 30 - merge-recursive copy vs. rename
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2288
not ok 31 - merge-recursive rename vs. rename/symlink # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2289
# still have 3 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2290
# passed all remaining 28 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2291
1..31
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2292
*** t3031-merge-criscross.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2293
ok 1 - setup repo with criss-cross history
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2294
ok 2 - recursive merge between F and G, causes segfault
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2295
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2296
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2297
*** t3032-merge-recursive-options.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2298
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2299
ok 2 - naive merge fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2300
ok 3 - --ignore-space-change makes merge succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2301
ok 4 - naive cherry-pick fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2302
ok 5 - -Xignore-space-change makes cherry-pick succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2303
ok 6 - --ignore-space-change: our w/s-only change wins
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2304
ok 7 - --ignore-space-change: their real change wins over w/s
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2305
ok 8 - --ignore-space-change: does not ignore new spaces
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2306
ok 9 - --ignore-all-space drops their new spaces
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2307
ok 10 - --ignore-all-space keeps our new spaces
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2308
ok 11 - --ignore-space-at-eol
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2309
# passed all 11 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2310
1..11
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2311
*** t3040-subprojects-basic.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2312
ok 1 - setup: create superproject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2313
ok 2 - setup: create subprojects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2314
ok 3 - check if fsck ignores the subprojects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2315
ok 4 - check if commit in a subproject detected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2316
ok 5 - check if a changed subproject HEAD can be committed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2317
ok 6 - check if diff-index works for subproject elements
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2318
ok 7 - check if diff-tree works for subproject elements
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2319
ok 8 - check if git diff works for subproject elements
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2320
ok 9 - check if clone works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2321
ok 10 - removing and adding subproject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2322
ok 11 - checkout in superproject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2323
# passed all 11 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2324
1..11
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2325
*** t3050-subprojects-fetch.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2326
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2327
ok 2 - clone
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2328
ok 3 - advance
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2329
ok 4 - fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2330
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2331
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2332
*** t3060-ls-files-with-tree.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2333
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2334
ok 2 - git -ls-files --with-tree should succeed from subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2335
ok 3 - git -ls-files --with-tree should add entries from named tree.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2336
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2337
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2338
*** t3100-ls-tree-restrict.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2339
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2340
ok 2 - ls-tree plain
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2341
ok 3 - ls-tree recursive
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2342
ok 4 - ls-tree recursive with -t
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2343
ok 5 - ls-tree recursive with -d
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2344
ok 6 - ls-tree filtered with path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2345
ok 7 - ls-tree filtered with path1 path0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2346
ok 8 - ls-tree filtered with path0/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2347
ok 9 - ls-tree filtered with path2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2348
ok 10 - ls-tree filtered with path2/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2349
ok 11 - ls-tree filtered with path2/baz
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2350
ok 12 - ls-tree filtered with path2/bak
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2351
ok 13 - ls-tree -t filtered with path2/bak
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2352
ok 14 - ls-tree with one path a prefix of the other
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2353
# passed all 14 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2354
1..14
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2355
*** t3101-ls-tree-dirname.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2356
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2357
ok 2 - ls-tree plain
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2358
ok 3 - ls-tree recursive
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2359
ok 4 - ls-tree filter 1.txt
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2360
ok 5 - ls-tree filter path1/b/c/1.txt
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2361
ok 6 - ls-tree filter all 1.txt files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2362
ok 7 - ls-tree filter directories
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2363
ok 8 - ls-tree filter odd names
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2364
ok 9 - ls-tree filter missing files and extra slashes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2365
ok 10 - ls-tree filter is leading path match
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2366
ok 11 - ls-tree --full-name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2367
ok 12 - ls-tree --full-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2368
ok 13 - ls-tree --full-tree -r
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2369
ok 14 - ls-tree --abbrev=5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2370
ok 15 - ls-tree --name-only
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2371
ok 16 - ls-tree --name-only -r
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2372
# passed all 16 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2373
1..16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2374
*** t3102-ls-tree-wildcards.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2375
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2376
ok 2 - ls-tree a[a] matches literally
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2377
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2378
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2379
*** t3103-ls-tree-misc.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2380
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2381
ok 2 - ls-tree fails with non-zero exit code on broken tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2382
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2383
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2384
*** t3200-branch.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2385
ok 1 - prepare a trivial repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2386
ok 2 - git branch --help should not have created a bogus branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2387
ok 3 - branch -h in broken repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2388
ok 4 - git branch abc should create a branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2389
ok 5 - git branch a/b/c should create a branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2390
ok 6 - git branch -l d/e/f should create a branch and a log
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2391
ok 7 - git branch -d d/e/f should delete a branch and a log
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2392
ok 8 - git branch j/k should work after branch j has been deleted
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2393
ok 9 - git branch l should work after branch l/m has been deleted
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2394
ok 10 - git branch -m dumps usage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2395
ok 11 - git branch -m m m/m should work
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2396
ok 12 - git branch -m n/n n should work
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2397
ok 13 - git branch -m o/o o should fail when o/p exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2398
ok 14 - git branch -m q r/q should fail when r exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2399
ok 15 - git branch -M foo bar should fail when bar is checked out
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2400
ok 16 - git branch -M baz bam should succeed when baz is checked out
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2401
ok 17 - git branch -M master should work when master is checked out
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2402
ok 18 - git branch -M master master should work when master is checked out
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2403
ok 19 - git branch -M master2 master2 should work when master is checked out
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2404
ok 20 - git branch -v -d t should work
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2405
ok 21 - git branch -v -m t s should work
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2406
ok 22 - git branch -m -d t s should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2407
ok 23 - git branch --list -d t should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2408
ok 24 - git branch -m q q2 without config should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2409
ok 25 - git branch -m s/s s should work when s/t is deleted
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2410
ok 26 - config information was renamed, too
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2411
ok 27 - renaming a symref is not allowed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2412
ok 28 - git branch -m u v should fail when the reflog for u is a symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2413
ok 29 - test tracking setup via --track
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2414
ok 30 - test tracking setup (non-wildcard, matching)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2415
ok 31 - test tracking setup (non-wildcard, not matching)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2416
ok 32 - test tracking setup via config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2417
ok 33 - test overriding tracking setup via --no-track
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2418
ok 34 - no tracking without .fetch entries
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2419
ok 35 - test tracking setup via --track but deeper
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2420
ok 36 - test deleting branch deletes branch config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2421
ok 37 - test deleting branch without config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2422
ok 38 - test --track without .fetch entries
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2423
ok 39 - branch from non-branch HEAD w/autosetupmerge=always
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2424
ok 40 - branch from non-branch HEAD w/--track causes failure
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2425
ok 41 - branch from tag w/--track causes failure
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2426
ok 42 - git checkout -b g/h/i -l should create a branch and a log
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2427
ok 43 - checkout -b makes reflog by default
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2428
ok 44 - checkout -b does not make reflog when core.logAllRefUpdates = false
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2429
ok 45 - checkout -b with -l makes reflog when core.logAllRefUpdates = false
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2430
ok 46 - avoid ambiguous track
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2431
ok 47 - autosetuprebase local on a tracked local branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2432
ok 48 - autosetuprebase always on a tracked local branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2433
ok 49 - autosetuprebase remote on a tracked local branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2434
ok 50 - autosetuprebase never on a tracked local branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2435
ok 51 - autosetuprebase local on a tracked remote branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2436
ok 52 - autosetuprebase never on a tracked remote branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2437
ok 53 - autosetuprebase remote on a tracked remote branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2438
ok 54 - autosetuprebase always on a tracked remote branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2439
ok 55 - autosetuprebase unconfigured on a tracked remote branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2440
ok 56 - autosetuprebase unconfigured on a tracked local branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2441
ok 57 - autosetuprebase unconfigured on untracked local branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2442
ok 58 - autosetuprebase unconfigured on untracked remote branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2443
ok 59 - autosetuprebase never on an untracked local branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2444
ok 60 - autosetuprebase local on an untracked local branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2445
ok 61 - autosetuprebase remote on an untracked local branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2446
ok 62 - autosetuprebase always on an untracked local branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2447
ok 63 - autosetuprebase never on an untracked remote branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2448
ok 64 - autosetuprebase local on an untracked remote branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2449
ok 65 - autosetuprebase remote on an untracked remote branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2450
ok 66 - autosetuprebase always on an untracked remote branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2451
ok 67 - autosetuprebase always on detached HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2452
ok 68 - detect misconfigured autosetuprebase (bad value)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2453
ok 69 - detect misconfigured autosetuprebase (no value)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2454
ok 70 - attempt to delete a branch without base and unmerged to HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2455
ok 71 - attempt to delete a branch merged to its base
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2456
ok 72 - attempt to delete a branch merged to its base
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2457
ok 73 - use set-upstream on the current branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2458
ok 74 - use --edit-description
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2459
ok 75 - detect typo in branch name when using --edit-description
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2460
ok 76 - refuse --edit-description on unborn branch for now
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2461
# passed all 76 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2462
1..76
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2463
*** t3201-branch-contains.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2464
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2465
ok 2 - branch --contains=master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2466
ok 3 - branch --contains master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2467
ok 4 - branch --contains=side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2468
ok 5 - side: branch --merged
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2469
ok 6 - side: branch --no-merged
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2470
ok 7 - master: branch --merged
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2471
ok 8 - master: branch --no-merged
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2472
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2473
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2474
*** t3202-show-branch-octopus.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2475
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2476
ok 2 - show-branch with more than 8 branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2477
ok 3 - show-branch with showbranch.default
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2478
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2479
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2480
*** t3203-branch-output.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2481
ok 1 - make commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2482
ok 2 - make branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2483
ok 3 - make remote branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2484
ok 4 - git branch shows local branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2485
ok 5 - git branch --list shows local branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2486
ok 6 - git branch --list pattern shows matching local branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2487
ok 7 - git branch -r shows remote branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2488
ok 8 - git branch -a shows local and remote branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2489
ok 9 - git branch -v shows branch summaries
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2490
ok 10 - git branch --list -v pattern shows branch summaries
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2491
ok 11 - git branch -v pattern does not show branch summaries
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2492
ok 12 - git branch shows detached HEAD properly
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2493
# passed all 12 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2494
1..12
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2495
*** t3210-pack-refs.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2496
ok 1 - prepare a trivial repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2497
ok 2 - see if git show-ref works as expected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2498
ok 3 - see if a branch still exists when packed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2499
ok 4 - git branch c/d should barf if branch c exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2500
ok 5 - see if a branch still exists after git pack-refs --prune
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2501
ok 6 - see if git pack-refs --prune remove ref files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2502
ok 7 - see if git pack-refs --prune removes empty dirs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2503
ok 8 - git branch g should work when git branch g/h has been deleted
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2504
ok 9 - git branch i/j/k should barf if branch i exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2505
ok 10 - test git branch k after branch k/l/m and k/lm have been deleted
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2506
ok 11 - test git branch n after some branch deletion and pruning
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2507
ok 12 - see if up-to-date packed refs are preserved
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2508
ok 13 - pack, prune and repack
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2509
# passed all 13 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2510
1..13
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2511
*** t3300-funny-names.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2512
ok 1 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2513
ok 2 - git ls-files no-funny
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2514
ok 3 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2515
ok 4 - git ls-files with-funny
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2516
ok 5 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2517
ok 6 - git ls-files -z with-funny
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2518
ok 7 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2519
ok 8 - git ls-tree with funny
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2520
ok 9 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2521
ok 10 - git diff-index with-funny
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2522
ok 11 - git diff-tree with-funny
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2523
ok 12 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2524
ok 13 - git diff-index -z with-funny
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2525
ok 14 - git diff-tree -z with-funny
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2526
ok 15 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2527
ok 16 - git diff-tree -C with-funny
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2528
ok 17 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2529
ok 18 - git diff-tree delete with-funny
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2530
ok 19 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2531
ok 20 - git diff-tree delete with-funny
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2532
ok 21 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2533
ok 22 - git diff-tree delete with-funny
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2534
ok 23 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2535
ok 24 - git diff-tree rename with-funny applied
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2536
ok 25 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2537
ok 26 - git diff-tree delete with-funny applied
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2538
ok 27 - git apply non-git diff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2539
# passed all 27 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2540
1..27
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2541
*** t3301-notes.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2542
ok 1 - cannot annotate non-existing HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2543
ok 2 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2544
ok 3 - need valid notes ref
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2545
ok 4 - refusing to add notes in refs/heads/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2546
ok 5 - refusing to edit notes in refs/remotes/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2547
ok 6 - handle empty notes gracefully
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2548
ok 7 - show non-existent notes entry with %N
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2549
ok 8 - create notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2550
ok 9 - show notes entry with %N
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2551
ok 10 - create reflog entry
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2552
ok 11 - edit existing notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2553
ok 12 - cannot "git notes add -m" where notes already exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2554
ok 13 - can overwrite existing note with "git notes add -f -m"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2555
ok 14 - add w/no options on existing note morphs into edit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2556
ok 15 - can overwrite existing note with "git notes add -f"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2557
ok 16 - show notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2558
ok 17 - create multi-line notes (setup)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2559
ok 18 - show multi-line notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2560
ok 19 - create -F notes (setup)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2561
ok 20 - show -F notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2562
ok 21 - Re-adding -F notes without -f fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2563
ok 22 - git log --pretty=raw does not show notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2564
ok 23 - git log --show-notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2565
ok 24 - git log --no-notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2566
ok 25 - git format-patch does not show notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2567
ok 26 - git format-patch --show-notes does show notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2568
ok 27 - git show  does show notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2569
ok 28 - git show --pretty does not show notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2570
ok 29 - git show --pretty=raw does not show notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2571
ok 30 - git show --pretty=short does not show notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2572
ok 31 - git show --pretty=medium does not show notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2573
ok 32 - git show --pretty=full does not show notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2574
ok 33 - git show --pretty=fuller does not show notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2575
ok 34 - git show --pretty=format:%s does not show notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2576
ok 35 - git show --oneline does not show notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2577
ok 36 - setup alternate notes ref
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2578
ok 37 - git log --notes shows default notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2579
ok 38 - git log --notes=X shows only X
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2580
ok 39 - git log --notes --notes=X shows both
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2581
ok 40 - git log --no-notes resets default state
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2582
ok 41 - git log --no-notes resets ref list
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2583
ok 42 - create -m notes (setup)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2584
ok 43 - show -m notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2585
ok 44 - remove note with add -f -F /dev/null (setup)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2586
ok 45 - verify note removal with -F /dev/null
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2587
ok 46 - do not create empty note with -m "" (setup)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2588
ok 47 - verify non-creation of note with -m ""
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2589
ok 48 - create note with combination of -m and -F
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2590
ok 49 - remove note with "git notes remove" (setup)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2591
ok 50 - verify note removal with "git notes remove"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2592
ok 51 - removing non-existing note should not create new commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2593
ok 52 - removing more than one
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2594
ok 53 - removing is atomic
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2595
ok 54 - removing with --ignore-missing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2596
ok 55 - removing with --ignore-missing but bogus ref
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2597
ok 56 - remove reads from --stdin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2598
ok 57 - remove --stdin is also atomic
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2599
ok 58 - removing with --stdin --ignore-missing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2600
ok 59 - list notes with "git notes list"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2601
ok 60 - list notes with "git notes"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2602
ok 61 - list specific note with "git notes list <object>"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2603
ok 62 - listing non-existing notes fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2604
ok 63 - append to existing note with "git notes append"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2605
ok 64 - "git notes list" does not expand to "git notes list HEAD"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2606
ok 65 - appending empty string does not change existing note
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2607
ok 66 - git notes append == add when there is no existing note
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2608
ok 67 - appending empty string to non-existing note does not create note
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2609
ok 68 - create other note on a different notes ref (setup)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2610
ok 69 - Do not show note on other ref by default
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2611
ok 70 - Do show note when ref is given in GIT_NOTES_REF
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2612
ok 71 - Do show note when ref is given in core.notesRef config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2613
ok 72 - Do not show note when core.notesRef is overridden
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2614
ok 73 - Show all notes when notes.displayRef=refs/notes/*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2615
ok 74 - core.notesRef is implicitly in notes.displayRef
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2616
ok 75 - notes.displayRef can be given more than once
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2617
ok 76 - notes.displayRef respects order
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2618
ok 77 - GIT_NOTES_DISPLAY_REF works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2619
ok 78 - GIT_NOTES_DISPLAY_REF overrides config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2620
ok 79 - --show-notes=* adds to GIT_NOTES_DISPLAY_REF
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2621
ok 80 - --no-standard-notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2622
ok 81 - --standard-notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2623
ok 82 - --show-notes=ref accumulates
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2624
ok 83 - Allow notes on non-commits (trees, blobs, tags)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2625
ok 84 - create note from other note with "git notes add -C"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2626
ok 85 - create note from non-existing note with "git notes add -C" fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2627
ok 86 - create note from other note with "git notes add -c"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2628
ok 87 - create note from non-existing note with "git notes add -c" fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2629
ok 88 - append to note from other note with "git notes append -C"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2630
ok 89 - create note from other note with "git notes append -c"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2631
ok 90 - append to note from other note with "git notes append -c"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2632
ok 91 - copy note with "git notes copy"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2633
ok 92 - prevent overwrite with "git notes copy"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2634
ok 93 - allow overwrite with "git notes copy -f"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2635
ok 94 - cannot copy note from object without notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2636
ok 95 - git notes copy --stdin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2637
ok 96 - git notes copy --for-rewrite (unconfigured)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2638
ok 97 - git notes copy --for-rewrite (enabled)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2639
ok 98 - git notes copy --for-rewrite (disabled)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2640
ok 99 - git notes copy --for-rewrite (overwrite)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2641
ok 100 - git notes copy --for-rewrite (ignore)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2642
ok 101 - git notes copy --for-rewrite (append)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2643
ok 102 - git notes copy --for-rewrite (append two to one)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2644
ok 103 - git notes copy --for-rewrite (append empty)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2645
ok 104 - GIT_NOTES_REWRITE_MODE works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2646
ok 105 - GIT_NOTES_REWRITE_REF works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2647
ok 106 - GIT_NOTES_REWRITE_REF overrides config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2648
ok 107 - git notes copy diagnoses too many or too few parameters
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2649
ok 108 - git notes get-ref (no overrides)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2650
ok 109 - git notes get-ref (core.notesRef)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2651
ok 110 - git notes get-ref (GIT_NOTES_REF)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2652
ok 111 - git notes get-ref (--ref)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2653
# passed all 111 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2654
1..111
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2655
*** t3302-notes-index-expensive.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2656
ok 1 - setup / mkdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2657
ok 2 - setup 10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2658
ok 3 - notes work
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2659
ok 4 - notes timing with /usr/bin/time
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2660
ok 5 - teardown / cd ..
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2661
ok 6 # skip setup / mkdir (missing EXPENSIVE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2662
ok 7 # skip setup 100 (missing EXPENSIVE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2663
ok 8 # skip notes work (missing EXPENSIVE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2664
ok 9 # skip notes timing with /usr/bin/time (missing EXPENSIVE of USR_BIN_TIME,EXPENSIVE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2665
ok 10 # skip teardown / cd .. (missing EXPENSIVE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2666
ok 11 # skip setup / mkdir (missing EXPENSIVE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2667
ok 12 # skip setup 1000 (missing EXPENSIVE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2668
ok 13 # skip notes work (missing EXPENSIVE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2669
ok 14 # skip notes timing with /usr/bin/time (missing EXPENSIVE of USR_BIN_TIME,EXPENSIVE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2670
ok 15 # skip teardown / cd .. (missing EXPENSIVE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2671
ok 16 # skip setup / mkdir (missing EXPENSIVE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2672
ok 17 # skip setup 10000 (missing EXPENSIVE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2673
ok 18 # skip notes work (missing EXPENSIVE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2674
ok 19 # skip notes timing with /usr/bin/time (missing EXPENSIVE of USR_BIN_TIME,EXPENSIVE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2675
ok 20 # skip teardown / cd .. (missing EXPENSIVE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2676
# passed all 20 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2677
1..20
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2678
*** t3303-notes-subtrees.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2679
ok 1 - setup: create 100 commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2680
ok 2 - test notes in 2/38-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2681
ok 3 - verify notes in 2/38-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2682
ok 4 - test notes in 2/2/36-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2683
ok 5 - verify notes in 2/2/36-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2684
ok 6 - test notes in 2/2/2/34-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2685
ok 7 - verify notes in 2/2/2/34-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2686
ok 8 - test same notes in no fanout and 2/38-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2687
ok 9 - verify same notes in no fanout and 2/38-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2688
ok 10 - test same notes in no fanout and 2/2/36-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2689
ok 11 - verify same notes in no fanout and 2/2/36-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2690
ok 12 - test same notes in 2/38-fanout and 2/2/36-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2691
ok 13 - verify same notes in 2/38-fanout and 2/2/36-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2692
ok 14 - test same notes in 2/2/2/34-fanout and 2/2/36-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2693
ok 15 - verify same notes in 2/2/2/34-fanout and 2/2/36-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2694
ok 16 - test notes in no fanout concatenated with 2/38-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2695
ok 17 - verify notes in no fanout concatenated with 2/38-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2696
ok 18 - test notes in no fanout concatenated with 2/2/36-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2697
ok 19 - verify notes in no fanout concatenated with 2/2/36-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2698
ok 20 - test notes in 2/38-fanout concatenated with 2/2/36-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2699
ok 21 - verify notes in 2/38-fanout concatenated with 2/2/36-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2700
ok 22 - test notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2701
ok 23 - verify notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2702
# passed all 23 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2703
1..23
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2704
*** t3304-notes-mixed.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2705
ok 1 - setup: create a couple of commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2706
ok 2 - create a notes tree with both notes and non-notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2707
ok 3 - verify contents of notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2708
ok 4 - verify contents of non-notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2709
ok 5 - git-notes preserves non-notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2710
ok 6 - verify contents of non-notes after git-notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2711
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2712
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2713
*** t3305-notes-fanout.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2714
ok 1 - creating many notes with git-notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2715
ok 2 - many notes created correctly with git-notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2716
ok 3 - many notes created with git-notes triggers fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2717
ok 4 - deleting most notes with git-notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2718
ok 5 - most notes deleted correctly with git-notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2719
ok 6 - deleting most notes triggers fanout consolidation
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2720
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2721
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2722
*** t3306-notes-prune.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2723
ok 1 - setup: create a few commits with notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2724
ok 2 - verify commits and notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2725
ok 3 - remove some commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2726
ok 4 - verify that commits are gone
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2727
ok 5 - verify that notes are still present
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2728
ok 6 - prune -n does not remove notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2729
ok 7 - prune -n lists prunable notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2730
ok 8 - prune notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2731
ok 9 - verify that notes are gone
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2732
ok 10 - remove some commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2733
ok 11 - prune -v notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2734
ok 12 - verify that notes are gone
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2735
# passed all 12 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2736
1..12
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2737
*** t3307-notes-man.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2738
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2739
ok 2 - example 1: notes to add an Acked-by line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2740
ok 3 - example 2: binary notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2741
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2742
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2743
*** t3308-notes-merge.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2744
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2745
ok 2 - verify initial notes (x)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2746
ok 3 - fail to merge empty notes ref into empty notes ref (z => y)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2747
ok 4 - fail to merge into various non-notes refs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2748
ok 5 - fail to merge various non-note-trees
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2749
ok 6 - merge notes into empty notes ref (x => y)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2750
ok 7 - merge empty notes ref (z => y)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2751
ok 8 - change notes on other notes ref (y)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2752
ok 9 - merge previous notes commit (y^ => y) => No-op
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2753
ok 10 - verify changed notes on other notes ref (y)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2754
ok 11 - verify unchanged notes on original notes ref (x)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2755
ok 12 - merge original notes (x) into changed notes (y) => No-op
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2756
ok 13 - merge changed (y) into original (x) => Fast-forward
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2757
ok 14 - merge empty notes ref (z => y)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2758
ok 15 - change notes on other notes ref (y)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2759
ok 16 - change notes on notes ref (x)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2760
ok 17 - merge y into x => Non-conflicting 3-way merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2761
ok 18 - create notes on new, separate notes ref (w)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2762
ok 19 - merge w into x => Non-conflicting history-less merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2763
# passed all 19 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2764
1..19
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2765
*** t3309-notes-merge-auto-resolve.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2766
ok 1 - setup commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2767
ok 2 - setup merge base (x)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2768
ok 3 - verify state of merge base (x)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2769
ok 4 - setup local branch (y)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2770
ok 5 - verify state of local branch (y)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2771
ok 6 - setup remote branch (z)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2772
ok 7 - verify state of remote branch (z)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2773
ok 8 - merge z into y with invalid strategy => Fail/No changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2774
ok 9 - merge z into y with "ours" strategy => Non-conflicting 3-way merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2775
ok 10 - reset to pre-merge state (y)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2776
ok 11 - merge z into y with "theirs" strategy => Non-conflicting 3-way merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2777
ok 12 - reset to pre-merge state (y)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2778
ok 13 - merge z into y with "union" strategy => Non-conflicting 3-way merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2779
ok 14 - reset to pre-merge state (y)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2780
ok 15 - merge y into z with "union" strategy => Non-conflicting 3-way merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2781
ok 16 - reset to pre-merge state (z)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2782
ok 17 - merge y into z with "cat_sort_uniq" strategy => Non-conflicting 3-way merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2783
# passed all 17 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2784
1..17
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2785
*** t3310-notes-merge-manual-resolve.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2786
ok 1 - setup commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2787
ok 2 - setup merge base (x)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2788
ok 3 - setup local branch (y)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2789
ok 4 - setup remote branch (z)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2790
ok 5 - merge z into m (== y) with default ("manual") resolver => Conflicting 3-way merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2791
ok 6 - change notes in z
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2792
ok 7 - cannot do merge w/conflicts when previous merge is unfinished
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2793
ok 8 - setup unrelated notes ref (w)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2794
ok 9 - can do merge without conflicts even if previous merge is unfinished (x => w)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2795
ok 10 - finalize conflicting merge (z => m)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2796
ok 11 - redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2797
ok 12 - abort notes merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2798
ok 13 - redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2799
ok 14 - add + remove notes in finalized merge (z => m)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2800
ok 15 - redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2801
ok 16 - reset notes ref m to somewhere else (w)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2802
ok 17 - fail to finalize conflicting merge if underlying ref has moved in the meantime (m != NOTES_MERGE_PARTIAL^1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2803
ok 18 - resolve situation by aborting the notes merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2804
# passed all 18 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2805
1..18
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2806
*** t3311-notes-merge-fanout.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2807
ok 1 - setup a few initial commits with notes (notes ref: x)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2808
ok 2 - sanity check (x)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2809
ok 3 - Add a few hundred commits w/notes to trigger fanout (x -> y)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2810
ok 4 - notes tree has fanout (y)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2811
ok 5 - No-op merge (already included) (x => y)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2812
ok 6 - Fast-forward merge (y => x)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2813
ok 7 - change some of the initial 5 notes (x -> z)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2814
ok 8 - notes tree has no fanout (z)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2815
ok 9 - successful merge without conflicts (y => z)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2816
ok 10 - notes tree still has fanout after merge (m)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2817
ok 11 - introduce conflicting changes (y -> w)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2818
ok 12 - successful merge using "ours" strategy (z => w)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2819
ok 13 - notes tree still has fanout after merge (m)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2820
ok 14 - successful merge using "theirs" strategy (z => w)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2821
ok 15 - notes tree still has fanout after merge (m)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2822
ok 16 - successful merge using "union" strategy (z => w)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2823
ok 17 - notes tree still has fanout after merge (m)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2824
ok 18 - successful merge using "cat_sort_uniq" strategy (z => w)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2825
ok 19 - notes tree still has fanout after merge (m)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2826
ok 20 - fails to merge using "manual" strategy (z => w)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2827
ok 21 - notes tree still has fanout after merge (m)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2828
ok 22 - verify conflict entries (with no fanout)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2829
ok 23 - resolve and finalize merge (z => w)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2830
ok 24 - notes tree still has fanout after merge (m)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2831
# passed all 24 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2832
1..24
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2833
*** t3400-rebase.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2834
ok 1 - prepare repository with topic branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2835
ok 2 - rebase on dirty worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2836
ok 3 - rebase on dirty cache
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2837
ok 4 - rebase against master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2838
ok 5 - rebase against master twice
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2839
ok 6 - rebase against master twice with --force
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2840
ok 7 - rebase against master twice from another branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2841
ok 8 - rebase fast-forward to master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2842
ok 9 - the rebase operation should not have destroyed author information
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2843
ok 10 - the rebase operation should not have destroyed author information (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2844
ok 11 - HEAD was detached during rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2845
ok 12 - rebase after merge master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2846
ok 13 - rebase of history with merges is linearized
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2847
ok 14 - rebase of history with merges after upstream merge is linearized
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2848
ok 15 - rebase a single mode change
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2849
ok 16 - rebase is not broken by diff.renames
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2850
ok 17 - setup: recover
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2851
ok 18 - Show verbose error when HEAD could not be detached
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2852
ok 19 - fail when upstream arg is missing and not on branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2853
ok 20 - fail when upstream arg is missing and not configured
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2854
ok 21 - default to @{upstream} when upstream arg is missing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2855
ok 22 - rebase -q is quiet
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2856
ok 23 - Rebase a commit that sprinkles CRs in
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2857
ok 24 - rebase can copy notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2858
ok 25 - rebase -m can copy notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2859
ok 26 - rebase commit with an ancient timestamp
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2860
# passed all 26 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2861
1..26
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2862
*** t3401-rebase-partial.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2863
ok 1 - prepare repository with topic branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2864
ok 2 - pick top patch from topic branch into master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2865
ok 3 - rebase topic branch against new master and check git am did not get halted
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2866
ok 4 - rebase --merge topic branch that was partially merged upstream
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2867
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2868
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2869
*** t3402-rebase-merge.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2870
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2871
ok 2 - reference merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2872
ok 3 - rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2873
ok 4 - test-rebase@{1} is pre rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2874
ok 5 - merge and rebase should match
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2875
ok 6 - rebase the other way
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2876
ok 7 - rebase -Xtheirs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2877
ok 8 - merge and rebase should match
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2878
ok 9 - picking rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2879
ok 10 - rebase -s funny -Xopt
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2880
# passed all 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2881
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2882
*** t3403-rebase-skip.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2883
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2884
ok 2 - rebase with git am -3 (default)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2885
ok 3 - rebase --skip can not be used with other options
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2886
ok 4 - rebase --skip with am -3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2887
ok 5 - rebase moves back to skip-reference
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2888
ok 6 - checkout skip-merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2889
ok 7 - rebase with --merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2890
ok 8 - rebase --skip with --merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2891
ok 9 - merge and reference trees equal
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2892
ok 10 - moved back to branch correctly
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2893
# passed all 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2894
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2895
*** t3404-rebase-interactive.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2896
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2897
ok 2 - rebase -i with the exec command
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2898
ok 3 - rebase -i with the exec command runs from tree root
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2899
ok 4 - rebase -i with the exec command checks tree cleanness
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2900
ok 5 - no changes are a nop
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2901
ok 6 - test the [branch] option
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2902
ok 7 - test --onto <branch>
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2903
ok 8 - rebase on top of a non-conflicting commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2904
ok 9 - reflog for the branch shows state before rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2905
ok 10 - exchange two commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2906
ok 11 - stop on conflicting pick
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2907
ok 12 - abort
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2908
ok 13 - abort with error when new base cannot be checked out
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2909
ok 14 - retain authorship
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2910
ok 15 - squash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2911
ok 16 - retain authorship when squashing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2912
ok 17 - -p handles "no changes" gracefully
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2913
not ok 18 - exchange two commits with -p # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2914
ok 19 - preserve merges with -p
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2915
ok 20 - edit ancestor with -p
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2916
ok 21 - --continue tries to commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2917
ok 22 - verbose flag is heeded, even after --continue
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2918
ok 23 - multi-squash only fires up editor once
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2919
ok 24 - multi-fixup does not fire up editor
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2920
ok 25 - commit message used after conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2921
ok 26 - commit message retained after conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2922
ok 27 - squash and fixup generate correct log messages
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2923
ok 28 - squash ignores comments
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2924
ok 29 - squash ignores blank lines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2925
ok 30 - squash works as expected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2926
ok 31 - interrupted squash works as expected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2927
ok 32 - interrupted squash works as expected (case 2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2928
ok 33 - ignore patch if in upstream
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2929
ok 34 - --continue tries to commit, even for "edit"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2930
ok 35 - aborted --continue does not squash commits after "edit"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2931
ok 36 - auto-amend only edited commits after "edit"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2932
ok 37 - clean error after failed "exec"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2933
ok 38 - rebase a detached HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2934
ok 39 - rebase a commit violating pre-commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2935
ok 40 - rebase with a file named HEAD in worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2936
ok 41 - do "noop" when there is nothing to cherry-pick
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2937
ok 42 - submodule rebase setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2938
ok 43 - submodule rebase -i
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2939
ok 44 - avoid unnecessary reset
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2940
ok 45 - reword
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2941
ok 46 - rebase -i can copy notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2942
ok 47 - rebase -i can copy notes over a fixup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2943
ok 48 - rebase while detaching HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2944
ok 49 - always cherry-pick with --no-ff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2945
ok 50 - set up commits with funny messages
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2946
ok 51 - rebase-i history with funny messages
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2947
# still have 1 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2948
# passed all remaining 50 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2949
1..51
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2950
*** t3405-rebase-malformed.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2951
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2952
ok 2 - rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2953
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2954
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2955
*** t3406-rebase-message.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2956
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2957
ok 2 - rebase -m
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2958
ok 3 - rebase --stat
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2959
ok 4 - rebase w/config rebase.stat
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2960
ok 5 - rebase -n overrides config rebase.stat config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2961
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2962
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2963
*** t3407-rebase-abort.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2964
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2965
ok 2 - rebase --abort
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2966
ok 3 - rebase --abort after --skip
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2967
ok 4 - rebase --abort after --continue
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2968
ok 5 - rebase --abort does not update reflog
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2969
ok 6 - rebase --abort can not be used with other options
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2970
ok 7 - rebase --merge --abort
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2971
ok 8 - rebase --merge --abort after --skip
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2972
ok 9 - rebase --merge --abort after --continue
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2973
ok 10 - rebase --merge --abort does not update reflog
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2974
ok 11 - rebase --abort can not be used with other options
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2975
# passed all 11 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2976
1..11
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2977
*** t3408-rebase-multi-line.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2978
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2979
ok 2 - rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2980
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2981
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2982
*** t3409-rebase-preserve-merges.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2983
ok 1 - setup for merge-preserving rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2984
ok 2 - rebase -p fakes interactive rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2985
ok 3 - --continue works after a conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2986
ok 4 - rebase -p preserves no-ff merges
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2987
ok 5 - rebase -p works when base inside second parent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2988
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2989
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2990
*** t3410-rebase-preserve-dropped-merges.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2991
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2992
ok 2 - skip same-resolution merges with -p
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2993
ok 3 - keep different-resolution merges with -p
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2994
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2995
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2996
*** t3411-rebase-preserve-around-merges.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2997
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2998
ok 2 - squash F1 into D1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  2999
ok 3 - rebase two levels of merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3000
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3001
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3002
*** t3412-rebase-root.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3003
ok 1 - prepare repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3004
ok 2 - rebase --root expects --onto
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3005
ok 3 - setup pre-rebase hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3006
ok 4 - rebase --root --onto <newbase>
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3007
ok 5 - pre-rebase got correct input (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3008
ok 6 - rebase --root --onto <newbase> <branch>
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3009
ok 7 - pre-rebase got correct input (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3010
ok 8 - rebase -i --root --onto <newbase>
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3011
ok 9 - pre-rebase got correct input (3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3012
ok 10 - rebase -i --root --onto <newbase> <branch>
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3013
ok 11 - pre-rebase got correct input (4)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3014
ok 12 - rebase -i -p with linear history
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3015
ok 13 - pre-rebase got correct input (5)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3016
ok 14 - set up merge history
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3017
ok 15 - rebase -i -p with merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3018
ok 16 - set up second root and merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3019
ok 17 - rebase -i -p with two roots
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3020
ok 18 - setup pre-rebase hook that fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3021
ok 19 - pre-rebase hook stops rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3022
ok 20 - pre-rebase hook stops rebase -i
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3023
ok 21 - remove pre-rebase hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3024
ok 22 - set up a conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3025
ok 23 - rebase --root with conflict (first part)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3026
ok 24 - fix the conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3027
ok 25 - rebase --root with conflict (second part)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3028
ok 26 - rebase -i --root with conflict (first part)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3029
ok 27 - fix the conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3030
ok 28 - rebase -i --root with conflict (second part)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3031
ok 29 - rebase -i -p --root with conflict (first part)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3032
ok 30 - fix the conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3033
ok 31 - rebase -i -p --root with conflict (second part)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3034
# passed all 31 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3035
1..31
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3036
*** t3413-rebase-hook.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3037
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3038
ok 2 - rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3039
ok 3 - rebase -i
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3040
ok 4 - setup pre-rebase hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3041
ok 5 - pre-rebase hook gets correct input (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3042
ok 6 - pre-rebase hook gets correct input (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3043
ok 7 - pre-rebase hook gets correct input (3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3044
ok 8 - pre-rebase hook gets correct input (4)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3045
ok 9 - pre-rebase hook gets correct input (5)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3046
ok 10 - pre-rebase hook gets correct input (6)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3047
ok 11 - setup pre-rebase hook that fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3048
ok 12 - pre-rebase hook stops rebase (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3049
ok 13 - pre-rebase hook stops rebase (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3050
ok 14 - rebase --no-verify overrides pre-rebase (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3051
ok 15 - rebase --no-verify overrides pre-rebase (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3052
# passed all 15 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3053
1..15
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3054
*** t3414-rebase-preserve-onto.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3055
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3056
ok 2 - rebase from B1 onto H1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3057
ok 3 - rebase from E1 onto H1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3058
ok 4 - rebase from C1 onto H1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3059
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3060
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3061
*** t3415-rebase-autosquash.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3062
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3063
ok 2 - auto fixup (option)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3064
ok 3 - auto fixup (config)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3065
ok 4 - auto squash (option)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3066
ok 5 - auto squash (config)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3067
ok 6 - misspelled auto squash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3068
ok 7 - auto squash that matches 2 commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3069
ok 8 - auto squash that matches a commit after the squash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3070
ok 9 - auto squash that matches a sha1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3071
ok 10 - auto squash that matches longer sha1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3072
ok 11 - use commit --fixup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3073
ok 12 - use commit --squash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3074
# passed all 12 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3075
1..12
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3076
*** t3416-rebase-onto-threedots.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3077
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3078
ok 2 - rebase --onto master...topic
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3079
ok 3 - rebase --onto master...
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3080
ok 4 - rebase --onto master...side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3081
ok 5 - rebase -i --onto master...topic
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3082
ok 6 - rebase -i --onto master...
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3083
ok 7 - rebase -i --onto master...side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3084
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3085
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3086
*** t3417-rebase-whitespace-fix.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3087
ok 1 - blank line at end of file; extend at end of file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3088
ok 2 - two blanks line at end of file; extend at end of file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3089
ok 3 - same, but do not remove trailing spaces
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3090
ok 4 - at beginning of file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3091
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3092
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3093
*** t3418-rebase-continue.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3094
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3095
ok 2 - interactive rebase --continue works with touched file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3096
ok 3 - non-interactive rebase --continue works with touched file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3097
ok 4 - rebase --continue can not be used with other options
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3098
ok 5 - rebase --continue remembers merge strategy and options
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3099
ok 6 - rebase --continue remembers --rerere-autoupdate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3100
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3101
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3102
*** t3419-rebase-patch-id.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3103
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3104
ok 2 - setup: 500 lines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3105
ok 3 - setup attributes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3106
ok 4 - detect upstream patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3107
ok 5 - do not drop patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3108
ok 6 # skip setup: 50000 lines (missing EXPENSIVE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3109
ok 7 # skip setup attributes (missing EXPENSIVE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3110
ok 8 # skip detect upstream patch (missing EXPENSIVE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3111
ok 9 # skip do not drop patch (missing EXPENSIVE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3112
# passed all 9 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3113
1..9
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3114
*** t3500-cherry.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3115
ok 1 - prepare repository with topic branch, and check cherry finds the 2 patches from there
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3116
ok 2 - check that cherry with limit returns only the top patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3117
ok 3 - cherry-pick one of the 2 patches, and check cherry recognized one and only one as new
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3118
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3119
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3120
*** t3501-revert-cherry-pick.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3121
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3122
ok 2 - cherry-pick --nonsense
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3123
ok 3 - revert --nonsense
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3124
ok 4 - cherry-pick after renaming branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3125
ok 5 - revert after renaming branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3126
ok 6 - cherry-pick on stat-dirty working tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3127
ok 7 - revert forbidden on dirty working tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3128
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3129
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3130
*** t3502-cherry-pick-merge.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3131
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3132
ok 2 - cherry-pick a non-merge with -m should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3133
ok 3 - cherry pick a merge without -m should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3134
ok 4 - cherry pick a merge (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3135
ok 5 - cherry pick a merge (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3136
ok 6 - cherry pick a merge relative to nonexistent parent should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3137
ok 7 - revert a non-merge with -m should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3138
ok 8 - revert a merge without -m should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3139
ok 9 - revert a merge (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3140
ok 10 - revert a merge (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3141
ok 11 - revert a merge relative to nonexistent parent should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3142
# passed all 11 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3143
1..11
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3144
*** t3503-cherry-pick-root.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3145
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3146
ok 2 - cherry-pick a root commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3147
ok 3 - revert a root commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3148
ok 4 - cherry-pick a root commit with an external strategy
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3149
ok 5 - revert a root commit with an external strategy
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3150
ok 6 - cherry-pick two root commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3151
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3152
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3153
*** t3504-cherry-pick-rerere.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3154
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3155
ok 2 - conflicting merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3156
ok 3 - fixup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3157
ok 4 - cherry-pick conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3158
ok 5 - reconfigure
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3159
ok 6 - cherry-pick conflict without rerere
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3160
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3161
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3162
*** t3505-cherry-pick-empty.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3163
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3164
ok 2 - cherry-pick an empty commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3165
ok 3 - index lockfile was removed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3166
ok 4 - cherry-pick a commit with an empty message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3167
ok 5 - index lockfile was removed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3168
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3169
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3170
*** t3506-cherry-pick-ff.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3171
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3172
ok 2 - cherry-pick using --ff fast forwards
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3173
ok 3 - cherry-pick not using --ff does not fast forwards
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3174
ok 4 - merge setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3175
ok 5 - cherry-pick a non-merge with --ff and -m should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3176
ok 6 - cherry pick a merge with --ff but without -m should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3177
ok 7 - cherry pick with --ff a merge (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3178
ok 8 - cherry pick with --ff a merge (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3179
ok 9 - cherry pick a merge relative to nonexistent parent with --ff should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3180
ok 10 - cherry pick a root commit with --ff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3181
# passed all 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3182
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3183
*** t3507-cherry-pick-conflict.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3184
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3185
ok 2 - failed cherry-pick does not advance HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3186
ok 3 - advice from failed cherry-pick
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3187
ok 4 - failed cherry-pick sets CHERRY_PICK_HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3188
ok 5 - successful cherry-pick does not set CHERRY_PICK_HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3189
ok 6 - cherry-pick --no-commit does not set CHERRY_PICK_HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3190
ok 7 - cherry-pick w/dirty tree does not set CHERRY_PICK_HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3191
ok 8 - cherry-pick --strategy=resolve w/dirty tree does not set CHERRY_PICK_HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3192
ok 9 - GIT_CHERRY_PICK_HELP suppresses CHERRY_PICK_HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3193
ok 10 - git reset clears CHERRY_PICK_HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3194
ok 11 - failed commit does not clear CHERRY_PICK_HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3195
ok 12 - cancelled commit does not clear CHERRY_PICK_HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3196
ok 13 - successful commit clears CHERRY_PICK_HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3197
ok 14 - failed cherry-pick produces dirty index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3198
ok 15 - failed cherry-pick registers participants in index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3199
ok 16 - failed cherry-pick describes conflict in work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3200
ok 17 - diff3 -m style
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3201
ok 18 - revert also handles conflicts sanely
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3202
ok 19 - failed revert sets REVERT_HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3203
ok 20 - successful revert does not set REVERT_HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3204
ok 21 - revert --no-commit sets REVERT_HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3205
ok 22 - revert w/dirty tree does not set REVERT_HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3206
ok 23 - GIT_CHERRY_PICK_HELP does not suppress REVERT_HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3207
ok 24 - git reset clears REVERT_HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3208
ok 25 - failed commit does not clear REVERT_HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3209
ok 26 - revert conflict, diff3 -m style
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3210
# passed all 26 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3211
1..26
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3212
*** t3508-cherry-pick-many-commits.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3213
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3214
ok 2 - cherry-pick first..fourth works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3215
ok 3 - cherry-pick --strategy resolve first..fourth works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3216
ok 4 - cherry-pick --ff first..fourth works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3217
ok 5 - cherry-pick -n first..fourth works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3218
ok 6 - revert first..fourth works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3219
ok 7 - revert ^first fourth works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3220
ok 8 - revert fourth fourth~1 fourth~2 works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3221
ok 9 - cherry-pick -3 fourth works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3222
ok 10 - cherry-pick --stdin works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3223
# passed all 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3224
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3225
*** t3509-cherry-pick-merge-df.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3226
ok 1 - Initialize repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3227
ok 2 - Setup rename across paths each below D/F conflicts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3228
ok 3 - Cherry-pick succeeds with rename across D/F conflicts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3229
ok 4 - Setup rename with file on one side matching directory name on other
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3230
ok 5 - Cherry-pick succeeds with was_a_dir/file -> was_a_dir (resolve)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3231
ok 6 - Cherry-pick succeeds with was_a_dir/file -> was_a_dir (recursive)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3232
ok 7 - Setup rename with file on one side matching different dirname on other
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3233
ok 8 - Cherry-pick with rename to different D/F conflict succeeds (resolve)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3234
ok 9 - Cherry-pick with rename to different D/F conflict succeeds (recursive)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3235
# passed all 9 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3236
1..9
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3237
*** t3510-cherry-pick-sequence.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3238
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3239
ok 2 - cherry-pick persists data on failure
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3240
ok 3 - cherry-pick mid-cherry-pick-sequence
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3241
ok 4 - cherry-pick persists opts correctly
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3242
ok 5 - cherry-pick cleans up sequencer state upon success
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3243
ok 6 - --quit does not complain when no cherry-pick is in progress
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3244
ok 7 - --abort requires cherry-pick in progress
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3245
ok 8 - --quit cleans up sequencer state
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3246
ok 9 - --quit keeps HEAD and conflicted index intact
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3247
ok 10 - --abort to cancel multiple cherry-pick
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3248
ok 11 - --abort to cancel single cherry-pick
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3249
ok 12 - cherry-pick --abort to cancel multiple revert
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3250
ok 13 - revert --abort works, too
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3251
ok 14 - --abort to cancel single revert
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3252
ok 15 - --abort keeps unrelated change, easy case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3253
ok 16 - --abort refuses to clobber unrelated change, harder case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3254
ok 17 - cherry-pick still writes sequencer state when one commit is left
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3255
ok 18 - --abort after last commit in sequence
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3256
ok 19 - cherry-pick does not implicitly stomp an existing operation
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3257
ok 20 - --continue complains when no cherry-pick is in progress
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3258
ok 21 - --continue complains when there are unresolved conflicts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3259
ok 22 - --continue of single cherry-pick
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3260
ok 23 - --continue of single revert
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3261
ok 24 - --continue after resolving conflicts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3262
ok 25 - --continue after resolving conflicts and committing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3263
ok 26 - --continue asks for help after resolving patch to nil
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3264
ok 27 - follow advice and skip nil patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3265
ok 28 - --continue respects opts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3266
ok 29 - --continue of single-pick respects -x
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3267
ok 30 - --continue respects -x in first commit in multi-pick
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3268
ok 31 - --signoff is not automatically propagated to resolved conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3269
ok 32 - --signoff dropped for implicit commit of resolution, multi-pick case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3270
ok 33 - sign-off needs to be reaffirmed after conflict resolution, single-pick case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3271
ok 34 - malformed instruction sheet 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3272
ok 35 - malformed instruction sheet 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3273
ok 36 - empty commit set
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3274
ok 37 - malformed instruction sheet 3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3275
ok 38 - instruction sheet, fat-fingers version
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3276
ok 39 - commit descriptions in insn sheet are optional
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3277
# passed all 39 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3278
1..39
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3279
*** t3600-rm.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3280
ok 1 - Initialize test directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3281
ok 2 - add files with funny names
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3282
ok 3 - Pre-check that foo exists and is in index before git rm foo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3283
ok 4 - Test that git rm foo succeeds
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3284
ok 5 - Test that git rm --cached foo succeeds if the index matches the file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3285
ok 6 - Test that git rm --cached foo succeeds if the index matches the file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3286
ok 7 - Test that git rm --cached foo fails if the index matches neither the file nor HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3287
ok 8 - Test that git rm --cached -f foo works in case where --cached only did not
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3288
ok 9 - Post-check that foo exists but is not in index after git rm foo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3289
ok 10 - Pre-check that bar exists and is in index before "git rm bar"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3290
ok 11 - Test that "git rm bar" succeeds
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3291
ok 12 - Post-check that bar does not exist and is not in index after "git rm -f bar"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3292
ok 13 - Test that "git rm -- -q" succeeds (remove a file that looks like an option)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3293
ok 14 - Test that "git rm -f" succeeds with embedded space, tab, or newline characters.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3294
ok 15 - Test that "git rm -f" fails if its rm fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3295
ok 16 - When the rm in "git rm -f" fails, it should not remove the file from the index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3296
ok 17 - Remove nonexistent file with --ignore-unmatch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3297
ok 18 - "rm" command printed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3298
ok 19 - "rm" command suppressed with --quiet
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3299
ok 20 - Re-add foo and baz
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3300
ok 21 - Modify foo -- rm should refuse
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3301
ok 22 - Modified foo -- rm -f should work
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3302
ok 23 - Re-add foo and baz for HEAD tests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3303
ok 24 - foo is different in index from HEAD -- rm should refuse
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3304
ok 25 - but with -f it should work.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3305
ok 26 - refuse to remove cached empty file with modifications
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3306
ok 27 - remove intent-to-add file without --force
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3307
ok 28 - Recursive test setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3308
ok 29 - Recursive without -r fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3309
ok 30 - Recursive with -r but dirty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3310
ok 31 - Recursive with -r -f
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3311
ok 32 - Remove nonexistent file returns nonzero exit status
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3312
ok 33 - Call "rm" from outside the work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3313
ok 34 - refresh index before checking if it is up-to-date
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3314
ok 35 - choking "git rm" should not let it die with cruft
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3315
ok 36 - rm removes subdirectories recursively
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3316
# passed all 36 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3317
1..36
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3318
*** t3700-add.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3319
ok 1 - Test of git add
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3320
ok 2 - Post-check that foo is in the index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3321
ok 3 - Test that "git add -- -q" works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3322
ok 4 - git add: Test that executable bit is not used if core.filemode=0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3323
ok 5 - git add: filemode=0 should not get confused by symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3324
ok 6 - git update-index --add: Test that executable bit is not used...
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3325
ok 7 - git add: filemode=0 should not get confused by symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3326
ok 8 - git update-index --add: Test that executable bit is not used...
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3327
ok 9 - .gitignore test setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3328
ok 10 - .gitignore is honored
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3329
ok 11 - error out when attempting to add ignored ones without -f
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3330
ok 12 - error out when attempting to add ignored ones without -f
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3331
ok 13 - add ignored ones with -f
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3332
ok 14 - add ignored ones with -f
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3333
ok 15 - add ignored ones with -f
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3334
ok 16 - .gitignore with subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3335
ok 17 - check correct prefix detection
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3336
ok 18 - git add with filemode=0, symlinks=0, and unmerged entries
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3337
ok 19 - git add with filemode=0, symlinks=0 prefers stage 2 over stage 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3338
ok 20 - git add --refresh
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3339
ok 21 - git add should fail atomically upon an unreadable file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3340
ok 22 - git add --ignore-errors
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3341
ok 23 - git add (add.ignore-errors)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3342
ok 24 - git add (add.ignore-errors = false)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3343
ok 25 - --no-ignore-errors overrides config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3344
ok 26 - git add 'fo\[ou\]bar' ignores foobar
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3345
ok 27 - git add to resolve conflicts on otherwise ignored path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3346
ok 28 - "add non-existent" should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3347
ok 29 - git add --dry-run of existing changed file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3348
ok 30 - git add --dry-run of non-existing file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3349
ok 31 - git add --dry-run of an existing file output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3350
ok 32 - git add --dry-run --ignore-missing of non-existing file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3351
ok 33 - git add --dry-run --ignore-missing of non-existing file output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3352
# passed all 33 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3353
1..33
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3354
*** t3701-add-interactive.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3355
ok 1 - setup (initial)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3356
ok 2 - status works (initial)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3357
ok 3 - setup expected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3358
ok 4 - diff works (initial)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3359
ok 5 - revert works (initial)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3360
ok 6 - setup (commit)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3361
ok 7 - status works (commit)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3362
ok 8 - setup expected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3363
ok 9 - diff works (commit)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3364
ok 10 - revert works (commit)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3365
ok 11 - setup expected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3366
ok 12 - setup fake editor
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3367
ok 13 - dummy edit works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3368
ok 14 - setup patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3369
ok 15 - setup fake editor
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3370
ok 16 - bad edit rejected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3371
ok 17 - setup patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3372
ok 18 - garbage edit rejected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3373
ok 19 - setup patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3374
ok 20 - setup expected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3375
ok 21 - real edit works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3376
ok 22 - skip files similarly as commit -a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3377
ok 23 - patch does not affect mode
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3378
ok 24 - stage mode but not hunk
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3379
ok 25 - stage mode and hunk
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3380
ok 26 - setup again
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3381
ok 27 - setup patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3382
ok 28 - setup expected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3383
ok 29 - add first line works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3384
ok 30 - setup expected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3385
ok 31 - deleting a non-empty file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3386
ok 32 - setup expected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3387
ok 33 - deleting an empty file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3388
ok 34 - split hunk setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3389
ok 35 - split hunk "add -p (edit)"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3390
# passed all 35 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3391
1..35
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3392
*** t3702-add-edit.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3393
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3394
ok 2 - add -e
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3395
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3396
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3397
*** t3703-add-magic-pathspec.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3398
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3399
ok 2 - add :/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3400
ok 3 - add :/anothersub
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3401
ok 4 - add :/non-existent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3402
ok 5 - a file with the same (long) magic name exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3403
ok 6 - a file with the same (short) magic name exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3404
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3405
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3406
*** t3800-mktag.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3407
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3408
ok 2 - Tag object length check
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3409
ok 3 - "object" line label check
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3410
ok 4 - "object" line SHA1 check
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3411
ok 5 - "type" line label check
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3412
ok 6 - "type" line eol check
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3413
ok 7 - "tag" line label check #1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3414
ok 8 - "tag" line label check #2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3415
ok 9 - "type" line type-name length check
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3416
ok 10 - verify object (SHA1/type) check
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3417
ok 11 - verify tag-name check
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3418
ok 12 - "tagger" line label check #1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3419
ok 13 - "tagger" line label check #2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3420
ok 14 - disallow missing tag author name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3421
ok 15 - disallow malformed tagger
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3422
ok 16 - allow empty tag email
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3423
ok 17 - disallow spaces in tag email
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3424
ok 18 - disallow missing tag timestamp
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3425
ok 19 - detect invalid tag timestamp1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3426
ok 20 - detect invalid tag timestamp2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3427
ok 21 - detect invalid tag timezone1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3428
ok 22 - detect invalid tag timezone2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3429
ok 23 - detect invalid tag timezone3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3430
ok 24 - detect invalid header entry
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3431
ok 25 - create valid tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3432
ok 26 - check mytag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3433
# passed all 26 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3434
1..26
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3435
*** t3900-i18n-commit.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3436
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3437
ok 2 - no encoding header for base case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3438
not ok 3 - UTF-16 refused because of NULs # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3439
ok 4 - ISO8859-1 setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3440
ok 5 - eucJP setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3441
ok 6 - ISO-2022-JP setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3442
ok 7 - check encoding header for ISO8859-1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3443
ok 8 - check encoding header for eucJP
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3444
ok 9 - check encoding header for ISO-2022-JP
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3445
ok 10 - config to remove customization
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3446
ok 11 - ISO8859-1 should be shown in UTF-8 now
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3447
ok 12 - eucJP should be shown in UTF-8 now
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3448
ok 13 - ISO-2022-JP should be shown in UTF-8 now
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3449
ok 14 - config to add customization
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3450
ok 15 - ISO8859-1 should be shown in itself now
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3451
ok 16 - eucJP should be shown in itself now
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3452
ok 17 - ISO-2022-JP should be shown in itself now
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3453
ok 18 - config to tweak customization
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3454
ok 19 - ISO8859-1 should be shown in UTF-8 now
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3455
ok 20 - eucJP should be shown in UTF-8 now
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3456
ok 21 - ISO-2022-JP should be shown in UTF-8 now
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3457
ok 22 - eucJP should be shown in eucJP now
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3458
ok 23 - ISO-2022-JP should be shown in eucJP now
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3459
ok 24 - eucJP should be shown in ISO-2022-JP now
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3460
ok 25 - ISO-2022-JP should be shown in ISO-2022-JP now
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3461
ok 26 - No conversion with ISO8859-1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3462
ok 27 - No conversion with eucJP
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3463
ok 28 - No conversion with ISO-2022-JP
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3464
ok 29 - commit --fixup with eucJP encoding
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3465
ok 30 - commit --squash with ISO-2022-JP encoding
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3466
# still have 1 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3467
# passed all remaining 29 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3468
1..30
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3469
*** t3901-i18n-patch.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3470
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3471
ok 2 - format-patch output (ISO-8859-1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3472
ok 3 - format-patch output (UTF-8)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3473
ok 4 - rebase (U/U)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3474
ok 5 - rebase (U/L)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3475
ok 6 - rebase (L/L)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3476
ok 7 - rebase (L/U)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3477
ok 8 - cherry-pick(U/U)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3478
ok 9 - cherry-pick(L/L)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3479
ok 10 - cherry-pick(U/L)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3480
ok 11 - cherry-pick(L/U)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3481
ok 12 - rebase --merge (U/U)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3482
ok 13 - rebase --merge (U/L)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3483
ok 14 - rebase --merge (L/L)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3484
ok 15 - rebase --merge (L/U)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3485
# passed all 15 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3486
1..15
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3487
*** t3902-quoted.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3488
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3489
ok 2 - setup expected files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3490
ok 3 - check fully quoted output from ls-files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3491
ok 4 - check fully quoted output from diff-files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3492
ok 5 - check fully quoted output from diff-index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3493
ok 6 - check fully quoted output from diff-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3494
ok 7 - check fully quoted output from ls-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3495
ok 8 - setting core.quotepath
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3496
ok 9 - check fully quoted output from ls-files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3497
ok 10 - check fully quoted output from diff-files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3498
ok 11 - check fully quoted output from diff-index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3499
ok 12 - check fully quoted output from diff-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3500
ok 13 - check fully quoted output from ls-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3501
# passed all 13 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3502
1..13
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3503
*** t3903-stash.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3504
ok 1 - stash some dirty working directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3505
ok 2 - parents of stash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3506
ok 3 - applying bogus stash does nothing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3507
ok 4 - apply does not need clean working directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3508
ok 5 - apply does not clobber working directory changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3509
ok 6 - apply stashed changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3510
ok 7 - apply stashed changes (including index)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3511
ok 8 - unstashing in a subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3512
ok 9 - drop top stash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3513
ok 10 - drop middle stash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3514
ok 11 - stash pop
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3515
ok 12 - stash branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3516
ok 13 - apply -q is quiet
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3517
ok 14 - save -q is quiet
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3518
ok 15 - pop -q is quiet
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3519
ok 16 - pop -q --index works and is quiet
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3520
ok 17 - drop -q is quiet
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3521
ok 18 - stash -k
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3522
ok 19 - stash --no-keep-index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3523
ok 20 - stash --invalid-option
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3524
ok 21 - stash an added file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3525
ok 22 - stash rm then recreate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3526
ok 23 - stash rm and ignore
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3527
ok 24 - stash rm and ignore (stage .gitignore)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3528
ok 25 - stash file to symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3529
ok 26 - stash file to symlink (stage rm)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3530
ok 27 - stash file to symlink (full stage)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3531
ok 28 - stash symlink to file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3532
ok 29 - stash symlink to file (stage rm)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3533
ok 30 - stash symlink to file (full stage)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3534
not ok 31 - stash directory to file # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3535
not ok 32 - stash file to directory # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3536
ok 33 - stash branch - no stashes on stack, stash-like argument
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3537
ok 34 - stash branch - stashes on stack, stash-like argument
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3538
ok 35 - stash show - stashes on stack, stash-like argument
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3539
ok 36 - stash show -p - stashes on stack, stash-like argument
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3540
ok 37 - stash show - no stashes on stack, stash-like argument
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3541
ok 38 - stash show -p - no stashes on stack, stash-like argument
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3542
ok 39 - stash drop - fail early if specified stash is not a stash reference
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3543
ok 40 - stash pop - fail early if specified stash is not a stash reference
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3544
ok 41 - ref with non-existent reflog
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3545
ok 42 - invalid ref of the form stash@{n}, n >= N
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3546
ok 43 - stash branch should not drop the stash if the branch exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3547
ok 44 - stash apply shows status same as git status (relative to current directory)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3548
ok 45 - stash where working directory contains "HEAD" file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3549
# still have 2 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3550
# passed all remaining 43 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3551
1..45
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3552
*** t3904-stash-patch.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3553
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3554
ok 2 - saying "n" does nothing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3555
ok 3 - git stash -p
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3556
ok 4 - git stash -p --no-keep-index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3557
ok 5 - git stash --no-keep-index -p
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3558
ok 6 - none of this moved HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3559
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3560
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3561
*** t3905-stash-include-untracked.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3562
ok 1 - stash save --include-untracked some dirty working directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3563
ok 2 - stash save --include-untracked cleaned the untracked files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3564
ok 3 - stash save --include-untracked stashed the untracked files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3565
ok 4 - stash save --patch --include-untracked fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3566
ok 5 - stash save --patch --all fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3567
ok 6 - stash pop after save --include-untracked leaves files untracked again
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3568
ok 7 - stash save -u dirty index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3569
ok 8 - stash save --include-untracked dirty index got stashed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3570
ok 9 - stash save --include-untracked -q is quiet
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3571
ok 10 - stash save --include-untracked removed files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3572
ok 11 - stash save --include-untracked removed files got stashed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3573
ok 12 - stash save --include-untracked respects .gitignore
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3574
ok 13 - stash save -u can stash with only untracked files different
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3575
ok 14 - stash save --all does not respect .gitignore
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3576
ok 15 - stash save --all is stash poppable
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3577
# passed all 15 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3578
1..15
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3579
*** t4000-diff-format.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3580
ok 1 - update-index --add two files with and without +x.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3581
ok 2 - git diff-files -p after editing work tree.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3582
ok 3 - validate git diff-files -p output.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3583
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3584
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3585
*** t4001-diff-rename.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3586
ok 1 - update-index --add a file.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3587
ok 2 - write that tree.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3588
ok 3 - renamed and edited the file.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3589
ok 4 - git diff-index -p -M after rename and editing.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3590
ok 5 - validate the output.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3591
ok 6 - favour same basenames over different ones
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3592
ok 7 - favour same basenames even with minor differences
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3593
ok 8 - setup for many rename source candidates
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3594
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3595
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3596
*** t4002-diff-basic.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3597
ok 1 - adding test file NN and Z/NN
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3598
ok 2 - adding test file ND and Z/ND
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3599
ok 3 - adding test file NM and Z/NM
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3600
ok 4 - adding test file DN and Z/DN
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3601
ok 5 - adding test file DD and Z/DD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3602
ok 6 - adding test file DM and Z/DM
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3603
ok 7 - adding test file MN and Z/MN
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3604
ok 8 - adding test file MD and Z/MD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3605
ok 9 - adding test file MM and Z/MM
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3606
ok 10 - adding test file SS
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3607
ok 11 - adding test file TT
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3608
ok 12 - prepare initial tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3609
ok 13 - change in branch A (removal)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3610
ok 14 - change in branch A (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3611
ok 15 - change in branch A (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3612
ok 16 - change in branch A (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3613
ok 17 - change in branch A (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3614
ok 18 - change in branch A (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3615
ok 19 - change in branch A (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3616
ok 20 - change in branch A (addition)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3617
ok 21 - change in branch A (addition)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3618
ok 22 - change in branch A (addition)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3619
ok 23 - change in branch A (addition)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3620
ok 24 - change in branch A (addition)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3621
ok 25 - change in branch A (edit)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3622
ok 26 - change in branch A (change file to directory)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3623
ok 27 - recording branch A tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3624
ok 28 - reading original tree and checking out
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3625
ok 29 - change in branch B (removal)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3626
ok 30 - change in branch B (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3627
ok 31 - change in branch B (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3628
ok 32 - change in branch B (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3629
ok 33 - change in branch B (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3630
ok 34 - change in branch B (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3631
ok 35 - change in branch B (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3632
ok 36 - change in branch B (addition)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3633
ok 37 - change in branch B (addition)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3634
ok 38 - change in branch B (addition)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3635
ok 39 - change in branch B (addition)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3636
ok 40 - change in branch B (addition and modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3637
ok 41 - change in branch B (modification)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3638
ok 42 - change in branch B (addition of a file to conflict with directory)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3639
ok 43 - recording branch B tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3640
ok 44 - keep contents of 3 trees for easy access
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3641
ok 45 - diff-tree of known trees.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3642
ok 46 - diff-tree of known trees.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3643
ok 47 - diff-tree of known trees.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3644
ok 48 - diff-tree of known trees.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3645
ok 49 - diff-tree of known trees.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3646
ok 50 - diff-tree of known trees.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3647
ok 51 - diff-tree --stdin of known trees.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3648
ok 52 - diff-tree --stdin of known trees.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3649
ok 53 - diff-cache O with A in cache
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3650
ok 54 - diff-cache O with B in cache
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3651
ok 55 - diff-cache A with B in cache
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3652
ok 56 - diff-files with O in cache and A checked out
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3653
ok 57 - diff-files with O in cache and B checked out
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3654
ok 58 - diff-files with A in cache and B checked out
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3655
ok 59 - diff-tree O A == diff-tree -R A O
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3656
ok 60 - diff-tree -r O A == diff-tree -r -R A O
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3657
ok 61 - diff-tree B A == diff-tree -R A B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3658
ok 62 - diff-tree -r B A == diff-tree -r -R A B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3659
ok 63 - diff can read from stdin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3660
# passed all 63 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3661
1..63
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3662
*** t4003-diff-rename-1.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3663
ok 1 - prepare reference tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3664
ok 2 - prepare work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3665
ok 3 - validate output from rename/copy detection (#1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3666
ok 4 - prepare work tree again
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3667
ok 5 - validate output from rename/copy detection (#2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3668
ok 6 - prepare work tree once again
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3669
ok 7 - validate output from rename/copy detection (#3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3670
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3671
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3672
*** t4004-diff-rename-symlink.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3673
ok 1 - prepare reference tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3674
ok 2 - prepare work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3675
ok 3 - setup diff output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3676
ok 4 - validate diff output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3677
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3678
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3679
*** t4005-diff-rename-2.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3680
ok 1 - prepare reference tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3681
ok 2 - prepare work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3682
ok 3 - validate output from rename/copy detection (#1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3683
ok 4 - prepare work tree again
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3684
ok 5 - validate output from rename/copy detection (#2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3685
ok 6 - prepare work tree once again
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3686
ok 7 - validate output from rename/copy detection (#3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3687
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3688
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3689
*** t4006-diff-mode.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3690
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3691
ok 2 - chmod
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3692
ok 3 - verify
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3693
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3694
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3695
*** t4007-rename-3.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3696
ok 1 - prepare reference tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3697
ok 2 - prepare work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3698
ok 3 - copy detection
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3699
ok 4 - copy detection, cached
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3700
ok 5 - copy, limited to a subtree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3701
ok 6 - tweak work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3702
ok 7 - rename detection
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3703
ok 8 - rename, limited to a subtree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3704
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3705
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3706
*** t4008-diff-break-rewrite.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3707
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3708
ok 2 - change file1 with copy-edit of file0 and remove file0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3709
ok 3 - run diff with -B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3710
ok 4 - validate result of -B (#1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3711
ok 5 - run diff with -B and -M
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3712
ok 6 - validate result of -B -M (#2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3713
ok 7 - swap file0 and file1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3714
ok 8 - run diff with -B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3715
ok 9 - validate result of -B (#3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3716
ok 10 - run diff with -B and -M
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3717
ok 11 - validate result of -B -M (#4)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3718
ok 12 - make file0 into something completely different
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3719
ok 13 - run diff with -B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3720
ok 14 - validate result of -B (#5)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3721
ok 15 - run diff with -B -M
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3722
ok 16 - validate result of -B -M (#6)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3723
ok 17 - run diff with -M
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3724
ok 18 - validate result of -M (#7)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3725
ok 19 - file1 edited to look like file0 and file0 rename-edited to file2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3726
ok 20 - run diff with -B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3727
ok 21 - validate result of -B (#8)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3728
ok 22 - run diff with -B -C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3729
ok 23 - validate result of -B -M (#9)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3730
# passed all 23 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3731
1..23
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3732
*** t4009-diff-rename-4.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3733
ok 1 - prepare reference tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3734
ok 2 - prepare work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3735
ok 3 - validate output from rename/copy detection (#1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3736
ok 4 - prepare work tree again
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3737
ok 5 - validate output from rename/copy detection (#2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3738
ok 6 - prepare work tree once again
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3739
ok 7 - validate output from rename/copy detection (#3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3740
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3741
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3742
*** t4010-diff-pathspec.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3743
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3744
ok 2 - limit to path should show nothing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3745
ok 3 - limit to path1 should show path1/file1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3746
ok 4 - limit to path1/ should show path1/file1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3747
ok 5 - "*file1" should show path1/file1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3748
ok 6 - limit to file0 should show file0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3749
ok 7 - limit to file0/ should emit nothing.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3750
ok 8 - diff-tree pathspec
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3751
ok 9 - diff-tree with wildcard shows dir also matches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3752
ok 10 - diff-tree -r with wildcard
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3753
ok 11 - diff-tree with wildcard shows dir also matches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3754
ok 12 - diff-tree -r with wildcard from beginning
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3755
ok 13 - diff-tree -r with wildcard
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3756
# passed all 13 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3757
1..13
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3758
*** t4011-diff-symlink.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3759
ok 1 - diff new symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3760
ok 2 - diff unchanged symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3761
ok 3 - diff removed symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3762
ok 4 - diff identical, but newly created symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3763
ok 5 - diff different symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3764
ok 6 - diff symlinks with non-existing targets
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3765
ok 7 - setup symlinks with attributes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3766
ok 8 - symlinks do not respect userdiff config by path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3767
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3768
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3769
*** t4012-diff-binary.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3770
ok 1 - prepare repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3771
ok 2 - diff without --binary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3772
ok 3 - diff with --binary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3773
ok 4 - apply detecting corrupt patch correctly
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3774
ok 5 - apply detecting corrupt patch correctly
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3775
ok 6 - initial commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3776
ok 7 - diff-index with --binary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3777
ok 8 - apply binary patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3778
ok 9 - diff --no-index with binary creation
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3779
# passed all 9 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3780
1..9
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3781
*** t4013-diff-various.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3782
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3783
ok 2 - git diff-tree initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3784
ok 3 - git diff-tree -r initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3785
ok 4 - git diff-tree -r --abbrev initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3786
ok 5 - git diff-tree -r --abbrev=4 initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3787
ok 6 - git diff-tree --root initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3788
ok 7 - git diff-tree --root --abbrev initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3789
ok 8 - git diff-tree --root -r initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3790
ok 9 - git diff-tree --root -r --abbrev initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3791
ok 10 - git diff-tree --root -r --abbrev=4 initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3792
ok 11 - git diff-tree -p initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3793
ok 12 - git diff-tree --root -p initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3794
ok 13 - git diff-tree --patch-with-stat initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3795
ok 14 - git diff-tree --root --patch-with-stat initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3796
ok 15 - git diff-tree --patch-with-raw initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3797
ok 16 - git diff-tree --root --patch-with-raw initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3798
ok 17 - git diff-tree --pretty initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3799
ok 18 - git diff-tree --pretty --root initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3800
ok 19 - git diff-tree --pretty -p initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3801
ok 20 - git diff-tree --pretty --stat initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3802
ok 21 - git diff-tree --pretty --summary initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3803
ok 22 - git diff-tree --pretty --stat --summary initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3804
ok 23 - git diff-tree --pretty --root -p initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3805
ok 24 - git diff-tree --pretty --root --stat initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3806
ok 25 - git diff-tree --pretty --root --summary initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3807
ok 26 - git diff-tree --pretty --root --summary -r initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3808
ok 27 - git diff-tree --pretty --root --stat --summary initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3809
ok 28 - git diff-tree --pretty --patch-with-stat initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3810
ok 29 - git diff-tree --pretty --root --patch-with-stat initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3811
ok 30 - git diff-tree --pretty --patch-with-raw initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3812
ok 31 - git diff-tree --pretty --root --patch-with-raw initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3813
ok 32 - git diff-tree --pretty=oneline initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3814
ok 33 - git diff-tree --pretty=oneline --root initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3815
ok 34 - git diff-tree --pretty=oneline -p initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3816
ok 35 - git diff-tree --pretty=oneline --root -p initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3817
ok 36 - git diff-tree --pretty=oneline --patch-with-stat initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3818
ok 37 - git diff-tree --pretty=oneline --root --patch-with-stat initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3819
ok 38 - git diff-tree --pretty=oneline --patch-with-raw initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3820
ok 39 - git diff-tree --pretty=oneline --root --patch-with-raw initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3821
ok 40 - git diff-tree --pretty side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3822
ok 41 - git diff-tree --pretty -p side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3823
ok 42 - git diff-tree --pretty --patch-with-stat side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3824
ok 43 - git diff-tree master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3825
ok 44 - git diff-tree -p master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3826
ok 45 - git diff-tree -p -m master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3827
ok 46 - git diff-tree -c master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3828
ok 47 - git diff-tree -c --abbrev master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3829
ok 48 - git diff-tree --cc master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3830
ok 49 - git diff-tree -c --stat master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3831
ok 50 - git diff-tree --cc --stat master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3832
ok 51 - git diff-tree -c --stat --summary master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3833
ok 52 - git diff-tree --cc --stat --summary master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3834
ok 53 - git diff-tree -c --stat --summary side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3835
ok 54 - git diff-tree --cc --stat --summary side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3836
ok 55 - git diff-tree --cc --patch-with-stat master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3837
ok 56 - git diff-tree --cc --patch-with-stat --summary master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3838
ok 57 - git diff-tree --cc --patch-with-stat --summary side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3839
ok 58 - git log master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3840
ok 59 - git log -p master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3841
ok 60 - git log --root master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3842
ok 61 - git log --root -p master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3843
ok 62 - git log --patch-with-stat master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3844
ok 63 - git log --root --patch-with-stat master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3845
ok 64 - git log --root --patch-with-stat --summary master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3846
ok 65 - git log --root -c --patch-with-stat --summary master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3847
ok 66 - git log --root --cc --patch-with-stat --summary master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3848
ok 67 - git log -p --first-parent master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3849
ok 68 - git log -m -p --first-parent master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3850
ok 69 - git log -m -p master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3851
ok 70 - git log -SF master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3852
ok 71 - git log -S F master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3853
ok 72 - git log -SF -p master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3854
ok 73 - git log -SF master --max-count=0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3855
ok 74 - git log -SF master --max-count=1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3856
ok 75 - git log -SF master --max-count=2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3857
ok 76 - git log -GF master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3858
ok 77 - git log -GF -p master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3859
ok 78 - git log -GF -p --pickaxe-all master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3860
ok 79 - git log --decorate --all
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3861
ok 80 - git log --decorate=full --all
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3862
ok 81 - git rev-list --parents HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3863
ok 82 - git rev-list --children HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3864
ok 83 - git whatchanged master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3865
ok 84 - git whatchanged -p master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3866
ok 85 - git whatchanged --root master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3867
ok 86 - git whatchanged --root -p master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3868
ok 87 - git whatchanged --patch-with-stat master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3869
ok 88 - git whatchanged --root --patch-with-stat master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3870
ok 89 - git whatchanged --root --patch-with-stat --summary master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3871
ok 90 - git whatchanged --root -c --patch-with-stat --summary master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3872
ok 91 - git whatchanged --root --cc --patch-with-stat --summary master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3873
ok 92 - git whatchanged -SF master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3874
ok 93 - git whatchanged -SF -p master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3875
ok 94 - git log --patch-with-stat master -- dir/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3876
ok 95 - git whatchanged --patch-with-stat master -- dir/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3877
ok 96 - git log --patch-with-stat --summary master -- dir/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3878
ok 97 - git whatchanged --patch-with-stat --summary master -- dir/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3879
ok 98 - git show initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3880
ok 99 - git show --root initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3881
ok 100 - git show side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3882
ok 101 - git show master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3883
ok 102 - git show -c master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3884
ok 103 - git show -m master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3885
ok 104 - git show --first-parent master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3886
ok 105 - git show --stat side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3887
ok 106 - git show --stat --summary side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3888
ok 107 - git show --patch-with-stat side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3889
ok 108 - git show --patch-with-raw side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3890
ok 109 - git show --patch-with-stat --summary side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3891
ok 110 - git format-patch --stdout initial..side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3892
ok 111 - git format-patch --stdout initial..master^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3893
ok 112 - git format-patch --stdout initial..master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3894
ok 113 - git format-patch --stdout --no-numbered initial..master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3895
ok 114 - git format-patch --stdout --numbered initial..master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3896
ok 115 - git format-patch --attach --stdout initial..side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3897
ok 116 - git format-patch --attach --stdout --suffix=.diff initial..side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3898
ok 117 - git format-patch --attach --stdout initial..master^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3899
ok 118 - git format-patch --attach --stdout initial..master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3900
ok 119 - git format-patch --inline --stdout initial..side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3901
ok 120 - git format-patch --inline --stdout initial..master^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3902
ok 121 - git format-patch --inline --stdout --numbered-files initial..master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3903
ok 122 - git format-patch --inline --stdout initial..master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3904
ok 123 - git format-patch --inline --stdout --subject-prefix=TESTCASE initial..master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3905
ok 124 - git config format.subjectprefix DIFFERENT_PREFIX
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3906
ok 125 - git format-patch --inline --stdout initial..master^^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3907
ok 126 - git format-patch --stdout --cover-letter -n initial..master^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3908
ok 127 - git diff --abbrev initial..side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3909
ok 128 - git diff -r initial..side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3910
ok 129 - git diff --stat initial..side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3911
ok 130 - git diff -r --stat initial..side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3912
ok 131 - git diff initial..side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3913
ok 132 - git diff --patch-with-stat initial..side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3914
ok 133 - git diff --patch-with-raw initial..side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3915
ok 134 - git diff --patch-with-stat -r initial..side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3916
ok 135 - git diff --patch-with-raw -r initial..side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3917
ok 136 - git diff --name-status dir2 dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3918
ok 137 - git diff --no-index --name-status dir2 dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3919
ok 138 - git diff --no-index --name-status -- dir2 dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3920
ok 139 - git diff --no-index dir dir3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3921
ok 140 - git diff master master^ side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3922
ok 141 - git diff --dirstat master~1 master~2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3923
ok 142 - git diff --dirstat initial rearrange
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3924
ok 143 - git diff --dirstat-by-file initial rearrange
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3925
ok 144 - log -S requires an argument
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3926
ok 145 - diff --cached on unborn branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3927
ok 146 - diff --cached -- file on unborn branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3928
# passed all 146 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3929
1..146
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3930
*** t4014-format-patch.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3931
ok 1 - set up terminal for tests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3932
ok 2 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3933
ok 3 - format-patch --ignore-if-in-upstream
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3934
ok 4 - format-patch --ignore-if-in-upstream
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3935
ok 5 - format-patch doesn't consider merge commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3936
ok 6 - format-patch result applies
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3937
ok 7 - format-patch --ignore-if-in-upstream result applies
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3938
ok 8 - commit did not screw up the log message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3939
ok 9 - format-patch did not screw up the log message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3940
ok 10 - replay did not screw up the log message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3941
ok 11 - extra headers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3942
ok 12 - extra headers without newlines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3943
ok 13 - extra headers with multiple To:s
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3944
ok 14 - additional command line cc
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3945
ok 15 - command line headers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3946
ok 16 - configuration headers and command line headers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3947
ok 17 - command line To: header
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3948
ok 18 - configuration To: header
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3949
ok 19 - --no-to overrides config.to
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3950
ok 20 - --no-to and --to replaces config.to
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3951
ok 21 - --no-cc overrides config.cc
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3952
ok 22 - --no-add-header overrides config.headers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3953
ok 23 - multiple files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3954
ok 24 - no threading
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3955
ok 25 - thread
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3956
ok 26 - thread in-reply-to
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3957
ok 27 - thread cover-letter
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3958
ok 28 - thread cover-letter in-reply-to
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3959
ok 29 - thread explicit shallow
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3960
ok 30 - thread deep
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3961
ok 31 - thread deep in-reply-to
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3962
ok 32 - thread deep cover-letter
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3963
ok 33 - thread deep cover-letter in-reply-to
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3964
ok 34 - thread via config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3965
ok 35 - thread deep via config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3966
ok 36 - thread config + override
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3967
ok 37 - thread config + --no-thread
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3968
ok 38 - excessive subject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3969
ok 39 - cover-letter inherits diff options
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3970
ok 40 - shortlog of cover-letter wraps overly-long onelines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3971
ok 41 - format-patch respects -U
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3972
ok 42 - format-patch -p suppresses stat
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3973
ok 43 - format-patch from a subdirectory (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3974
ok 44 - format-patch from a subdirectory (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3975
ok 45 - format-patch from a subdirectory (3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3976
ok 46 - format-patch --in-reply-to
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3977
ok 47 - format-patch --signoff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3978
ok 48 - options no longer allowed for format-patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3979
ok 49 - format-patch --numstat should produce a patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3980
ok 50 - format-patch -- <path>
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3981
ok 51 - format-patch --ignore-if-in-upstream HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3982
ok 52 - format-patch --signature
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3983
ok 53 - format-patch with format.signature config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3984
ok 54 - format-patch --signature overrides format.signature
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3985
ok 55 - format-patch --no-signature ignores format.signature
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3986
ok 56 - format-patch --signature --cover-letter
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3987
ok 57 - format.signature="" supresses signatures
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3988
ok 58 - format-patch --no-signature supresses signatures
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3989
ok 59 - format-patch --signature="" supresses signatures
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3990
ok 60 # skip format-patch --stdout paginates (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3991
ok 61 # skip format-patch --stdout pagination can be disabled (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3992
ok 62 - format-patch handles multi-line subjects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3993
ok 63 - format-patch handles multi-line encoded subjects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3994
ok 64 - format-patch wraps extremely long headers (ascii)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3995
ok 65 - format-patch wraps extremely long headers (rfc2047)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3996
ok 66 - format-patch wraps non-quotable headers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3997
ok 67 - format-patch quotes dot in headers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3998
ok 68 - format-patch quotes double-quote in headers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  3999
ok 69 - rfc2047-encoded headers also double-quote 822 specials
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4000
ok 70 - subject lines do not have 822 atom-quoting
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4001
ok 71 - subject prefixes have space prepended
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4002
ok 72 - empty subject prefix does not have extra space
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4003
ok 73 - format patch ignores color.ui
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4004
# passed all 73 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4005
1..73
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4006
*** t4015-diff-whitespace.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4007
ok 1 - Ray's example without options
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4008
ok 2 - Ray's example with -w
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4009
ok 3 - Ray's example with -b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4010
ok 4 - another test, without options
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4011
ok 5 - another test, with -w
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4012
ok 6 - another test, with -w -b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4013
ok 7 - another test, with -w --ignore-space-at-eol
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4014
ok 8 - another test, with -w -b --ignore-space-at-eol
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4015
ok 9 - another test, with -b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4016
ok 10 - another test, with -b --ignore-space-at-eol
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4017
ok 11 - another test, with --ignore-space-at-eol
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4018
ok 12 - check mixed spaces and tabs in indent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4019
ok 13 - check mixed tabs and spaces in indent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4020
ok 14 - check with no whitespace errors
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4021
ok 15 - check with trailing whitespace
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4022
ok 16 - check with space before tab in indent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4023
ok 17 - --check and --exit-code are not exclusive
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4024
ok 18 - --check and --quiet are not exclusive
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4025
ok 19 - check staged with no whitespace errors
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4026
ok 20 - check staged with trailing whitespace
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4027
ok 21 - check staged with space before tab in indent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4028
ok 22 - check with no whitespace errors (diff-index)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4029
ok 23 - check with trailing whitespace (diff-index)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4030
ok 24 - check with space before tab in indent (diff-index)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4031
ok 25 - check staged with no whitespace errors (diff-index)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4032
ok 26 - check staged with trailing whitespace (diff-index)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4033
ok 27 - check staged with space before tab in indent (diff-index)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4034
ok 28 - check with no whitespace errors (diff-tree)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4035
ok 29 - check with trailing whitespace (diff-tree)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4036
ok 30 - check with space before tab in indent (diff-tree)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4037
ok 31 - check trailing whitespace (trailing-space: off)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4038
ok 32 - check trailing whitespace (trailing-space: on)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4039
ok 33 - check space before tab in indent (space-before-tab: off)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4040
ok 34 - check space before tab in indent (space-before-tab: on)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4041
ok 35 - check spaces as indentation (indent-with-non-tab: off)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4042
ok 36 - check spaces as indentation (indent-with-non-tab: on)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4043
ok 37 - ditto, but tabwidth=9
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4044
ok 38 - check tabs and spaces as indentation (indent-with-non-tab: on)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4045
ok 39 - ditto, but tabwidth=10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4046
ok 40 - ditto, but tabwidth=20
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4047
ok 41 - check tabs as indentation (tab-in-indent: off)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4048
ok 42 - check tabs as indentation (tab-in-indent: on)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4049
ok 43 - check tabs and spaces as indentation (tab-in-indent: on)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4050
ok 44 - ditto, but tabwidth=1 (must be irrelevant)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4051
ok 45 - check tab-in-indent and indent-with-non-tab conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4052
ok 46 - check tab-in-indent excluded from wildcard whitespace attribute
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4053
ok 47 - line numbers in --check output are correct
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4054
ok 48 - checkdiff detects new trailing blank lines (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4055
ok 49 - checkdiff detects new trailing blank lines (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4056
ok 50 - checkdiff allows new blank lines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4057
ok 51 - whitespace-only changes not reported
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4058
ok 52 - whitespace-only changes reported across renames
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4059
ok 53 - rename empty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4060
ok 54 - combined diff with autocrlf conversion
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4061
ok 55 - setup diff colors
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4062
ok 56 - diff that introduces a line with only tabs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4063
# passed all 56 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4064
1..56
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4065
*** t4016-diff-quote.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4066
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4067
ok 2 - setup expected files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4068
ok 3 - git diff --summary -M HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4069
ok 4 - setup expected files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4070
ok 5 - git diff --stat -M HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4071
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4072
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4073
*** t4017-diff-retval.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4074
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4075
ok 2 - git diff --quiet -w  HEAD^^ HEAD^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4076
ok 3 - git diff --quiet HEAD^^ HEAD^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4077
ok 4 - git diff --quiet -w  HEAD^ HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4078
ok 5 - git diff-tree HEAD^ HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4079
ok 6 - git diff-tree HEAD^ HEAD -- a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4080
ok 7 - git diff-tree HEAD^ HEAD -- b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4081
ok 8 - echo HEAD | git diff-tree --stdin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4082
ok 9 - git diff-tree HEAD HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4083
ok 10 - git diff-files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4084
ok 11 - git diff-index --cached HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4085
ok 12 - git diff-index --cached HEAD^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4086
ok 13 - git diff-index --cached HEAD^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4087
ok 14 - git diff-tree -Stext HEAD^ HEAD -- b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4088
ok 15 - git diff-tree -Snot-found HEAD^ HEAD -- b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4089
ok 16 - git diff-files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4090
ok 17 - git diff-index --cached HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4091
ok 18 - --check --exit-code returns 0 for no difference
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4092
ok 19 - --check --exit-code returns 1 for a clean difference
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4093
ok 20 - --check --exit-code returns 3 for a dirty difference
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4094
ok 21 - --check with --no-pager returns 2 for dirty difference
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4095
ok 22 - check should test not just the last line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4096
ok 23 - check detects leftover conflict markers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4097
ok 24 - check honors conflict marker length
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4098
# passed all 24 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4099
1..24
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4100
*** t4018-diff-funcname.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4101
ok 1 - builtin bibtex pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4102
ok 2 - builtin bibtex wordRegex pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4103
ok 3 - builtin cpp pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4104
ok 4 - builtin cpp wordRegex pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4105
ok 5 - builtin csharp pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4106
ok 6 - builtin csharp wordRegex pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4107
ok 7 - builtin fortran pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4108
ok 8 - builtin fortran wordRegex pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4109
ok 9 - builtin html pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4110
ok 10 - builtin html wordRegex pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4111
ok 11 - builtin java pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4112
ok 12 - builtin java wordRegex pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4113
ok 13 - builtin matlab pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4114
ok 14 - builtin matlab wordRegex pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4115
ok 15 - builtin objc pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4116
ok 16 - builtin objc wordRegex pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4117
ok 17 - builtin pascal pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4118
ok 18 - builtin pascal wordRegex pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4119
ok 19 - builtin perl pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4120
ok 20 - builtin perl wordRegex pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4121
ok 21 - builtin php pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4122
ok 22 - builtin php wordRegex pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4123
ok 23 - builtin python pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4124
ok 24 - builtin python wordRegex pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4125
ok 25 - builtin ruby pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4126
ok 26 - builtin ruby wordRegex pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4127
ok 27 - builtin tex pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4128
ok 28 - builtin tex wordRegex pattern compiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4129
ok 29 - default behaviour
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4130
ok 30 - set up .gitattributes declaring drivers to test
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4131
ok 31 - preset java pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4132
ok 32 - preset perl pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4133
ok 33 - perl pattern accepts K&R style brace placement, too
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4134
ok 34 - but is not distracted by end of <<here document
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4135
ok 35 - perl pattern is not distracted by sub within POD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4136
ok 36 - perl pattern gets full line of POD header
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4137
ok 37 - perl pattern is not distracted by forward declaration
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4138
ok 38 - custom pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4139
ok 39 - last regexp must not be negated
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4140
ok 40 - pattern which matches to end of line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4141
ok 41 - alternation in pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4142
# passed all 41 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4143
1..41
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4144
*** t4019-diff-wserror.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4145
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4146
ok 2 - default
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4147
ok 3 - default (attribute)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4148
ok 4 - default, tabwidth=10 (attribute)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4149
ok 5 - no check (attribute)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4150
ok 6 - no check, tabwidth=10 (attribute), must be irrelevant
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4151
ok 7 - without -trail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4152
ok 8 - without -trail (attribute)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4153
ok 9 - without -space
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4154
ok 10 - without -space (attribute)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4155
ok 11 - with indent-non-tab only
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4156
ok 12 - with indent-non-tab only (attribute)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4157
ok 13 - with indent-non-tab only, tabwidth=10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4158
ok 14 - with indent-non-tab only, tabwidth=10 (attribute)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4159
ok 15 - with cr-at-eol
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4160
ok 16 - with cr-at-eol (attribute)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4161
ok 17 - trailing empty lines (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4162
ok 18 - trailing empty lines (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4163
ok 19 - checkdiff shows correct line number for trailing blank lines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4164
ok 20 - do not color trailing cr in context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4165
ok 21 - color new trailing blank lines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4166
# passed all 21 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4167
1..21
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4168
*** t4020-diff-external.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4169
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4170
ok 2 - GIT_EXTERNAL_DIFF environment
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4171
ok 3 - GIT_EXTERNAL_DIFF environment should apply only to diff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4172
ok 4 - GIT_EXTERNAL_DIFF environment and --no-ext-diff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4173
ok 5 - diff attribute
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4174
ok 6 - diff attribute should apply only to diff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4175
ok 7 - diff attribute and --no-ext-diff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4176
ok 8 - diff attribute
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4177
ok 9 - diff attribute should apply only to diff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4178
ok 10 - diff attribute and --no-ext-diff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4179
ok 11 - no diff with -diff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4180
ok 12 - force diff with "diff"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4181
ok 13 - GIT_EXTERNAL_DIFF with more than one changed files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4182
ok 14 - GIT_EXTERNAL_DIFF generates pretty paths
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4183
ok 15 - external diff with autocrlf = true
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4184
ok 16 - diff --cached
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4185
# passed all 16 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4186
1..16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4187
*** t4021-format-patch-numbered.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4188
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4189
ok 2 - single patch defaults to no numbers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4190
ok 3 - multiple patch defaults to numbered
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4191
ok 4 - Use --numbered
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4192
ok 5 - format.numbered = true
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4193
ok 6 - format.numbered && single patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4194
ok 7 - format.numbered && --no-numbered
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4195
ok 8 - format.numbered && --keep-subject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4196
ok 9 - format.numbered = auto
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4197
ok 10 - format.numbered = auto && single patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4198
ok 11 - format.numbered = auto && --no-numbered
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4199
ok 12 - --start-number && --numbered
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4200
# passed all 12 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4201
1..12
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4202
*** t4022-diff-rewrite.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4203
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4204
ok 2 - detect rewrite
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4205
ok 3 - show deletion diff without -D
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4206
ok 4 - suppress deletion diff with -D
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4207
ok 5 - show deletion diff with -B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4208
ok 6 - suppress deletion diff with -B -D
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4209
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4210
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4211
*** t4023-diff-rename-typechange.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4212
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4213
ok 2 - cross renames to be detected for regular files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4214
ok 3 - cross renames to be detected for typechange
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4215
ok 4 - moves and renames
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4216
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4217
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4218
*** t4024-diff-optimize-common.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4219
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4220
ok 2 - diff -U0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4221
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4222
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4223
*** t4025-hunk-header.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4224
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4225
ok 2 - hunk header truncation with an overly long line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4226
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4227
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4228
*** t4026-color.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4229
ok 1 - reset
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4230
ok 2 - attribute before color name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4231
ok 3 - color name before attribute
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4232
ok 4 - attr fg bg
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4233
ok 5 - fg attr bg
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4234
ok 6 - fg bg attr
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4235
ok 7 - fg bg attr...
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4236
ok 8 - long color specification
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4237
ok 9 - 256 colors
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4238
ok 10 - color too small
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4239
ok 11 - color too big
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4240
ok 12 - extra character after color number
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4241
ok 13 - extra character after color name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4242
ok 14 - extra character after attribute
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4243
ok 15 - unknown color slots are ignored (diff)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4244
ok 16 - unknown color slots are ignored (branch)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4245
ok 17 - unknown color slots are ignored (status)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4246
# passed all 17 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4247
1..17
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4248
*** t4027-diff-submodule.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4249
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4250
ok 2 - git diff --raw HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4251
ok 3 - git diff-index --raw HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4252
ok 4 - git diff-files --raw
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4253
ok 5 - git diff HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4254
ok 6 - git diff HEAD with dirty submodule (work tree)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4255
ok 7 - git diff HEAD with dirty submodule (index)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4256
ok 8 - git diff HEAD with dirty submodule (untracked)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4257
ok 9 - git diff HEAD with dirty submodule (work tree, refs match)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4258
ok 10 - git diff HEAD with dirty submodule (work tree, refs match) [.git/config]
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4259
ok 11 - git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4260
ok 12 - git diff HEAD with dirty submodule (index, refs match)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4261
ok 13 - git diff HEAD with dirty submodule (untracked, refs match)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4262
ok 14 - git diff HEAD with dirty submodule (untracked, refs match) [.git/config]
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4263
ok 15 - git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules]
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4264
ok 16 - git diff between submodule commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4265
ok 17 - git diff between submodule commits [.git/config]
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4266
ok 18 - git diff between submodule commits [.gitmodules]
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4267
ok 19 - git diff (empty submodule dir)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4268
ok 20 - conflicted submodule setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4269
ok 21 - combined (empty submodule)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4270
ok 22 - combined (with submodule)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4271
# passed all 22 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4272
1..22
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4273
*** t4028-format-patch-mime-headers.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4274
ok 1 - create commit with utf-8 body
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4275
ok 2 - patch has mime headers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4276
ok 3 - patch has mime and extra headers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4277
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4278
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4279
*** t4029-diff-trailing-space.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4280
ok 1 - diff honors config option, diff.suppressBlankEmpty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4281
# passed all 1 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4282
1..1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4283
*** t4030-diff-textconv.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4284
ok 1 - setup binary file with history
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4285
ok 2 - file is considered binary by porcelain
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4286
ok 3 - file is considered binary by plumbing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4287
ok 4 - setup textconv filters
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4288
ok 5 - diff produces text
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4289
ok 6 - diff-tree produces binary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4290
ok 7 - log produces text
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4291
ok 8 - format-patch produces binary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4292
ok 9 - status -v produces text
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4293
ok 10 - diffstat does not run textconv
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4294
ok 11 - textconv does not act on symlinks
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4295
# passed all 11 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4296
1..11
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4297
*** t4031-diff-rewrite-binary.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4298
ok 1 - create binary file with changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4299
ok 2 - vanilla diff is binary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4300
ok 3 - rewrite diff is binary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4301
ok 4 - rewrite diff can show binary patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4302
ok 5 - rewrite diff --stat shows binary changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4303
ok 6 - setup textconv
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4304
ok 7 - rewrite diff respects textconv
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4305
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4306
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4307
*** t4032-diff-inter-hunk-context.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4308
ok 1 - diff -U0, 1 common line: count hunks (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4309
ok 2 - diff -U0, 1 common line: check output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4310
ok 3 - diff -U0 --inter-hunk-context=0, 1 common line: count hunks (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4311
ok 4 - diff -U0 --inter-hunk-context=0, 1 common line: check output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4312
ok 5 - diff -U0 --inter-hunk-context=1, 1 common line: count hunks (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4313
ok 6 - diff -U0 --inter-hunk-context=1, 1 common line: check output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4314
ok 7 - diff -U0 --inter-hunk-context=2, 1 common line: count hunks (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4315
ok 8 - diff -U0 --inter-hunk-context=2, 1 common line: check output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4316
ok 9 - diff -U1, 1 common line: count hunks (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4317
ok 10 - diff -U0, 2 common lines: count hunks (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4318
ok 11 - diff -U0 --inter-hunk-context=0, 2 common lines: count hunks (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4319
ok 12 - diff -U0 --inter-hunk-context=1, 2 common lines: count hunks (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4320
ok 13 - diff -U0 --inter-hunk-context=2, 2 common lines: count hunks (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4321
ok 14 - diff -U1, 2 common lines: count hunks (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4322
ok 15 - diff -U1, 3 common lines: count hunks (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4323
ok 16 - diff -U1 --inter-hunk-context=0, 3 common lines: count hunks (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4324
ok 17 - diff -U1 --inter-hunk-context=1, 3 common lines: count hunks (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4325
ok 18 - diff -U1 --inter-hunk-context=2, 3 common lines: count hunks (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4326
ok 19 - diff -U3, 9 common lines: count hunks (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4327
ok 20 - diff -U3 --inter-hunk-context=2, 9 common lines: count hunks (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4328
ok 21 - diff -U3 --inter-hunk-context=3, 9 common lines: count hunks (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4329
# passed all 21 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4330
1..21
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4331
*** t4033-diff-patience.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4332
ok 1 - patience diff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4333
ok 2 - patience diff output is valid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4334
ok 3 - completely different files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4335
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4336
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4337
*** t4034-diff-words.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4338
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4339
ok 2 - set up pre and post with runs of whitespace
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4340
ok 3 - word diff with runs of whitespace
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4341
ok 4 - --word-diff=porcelain
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4342
ok 5 - --word-diff=plain
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4343
ok 6 - --word-diff=plain --color
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4344
ok 7 - word diff without context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4345
ok 8 - word diff with a regular expression
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4346
ok 9 - set up a diff driver
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4347
ok 10 - option overrides .gitattributes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4348
ok 11 - use regex supplied by driver
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4349
ok 12 - set up diff.wordRegex option
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4350
ok 13 - command-line overrides config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4351
ok 14 - command-line overrides config: --word-diff-regex
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4352
ok 15 - .gitattributes override config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4353
ok 16 - setup: remove diff driver regex
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4354
ok 17 - use configured regex
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4355
ok 18 - test parsing words for newline
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4356
ok 19 - test when words are only removed at the end
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4357
ok 20 - --word-diff=none
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4358
ok 21 - diff driver 'bibtex'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4359
ok 22 - diff driver 'cpp'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4360
ok 23 - diff driver 'csharp'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4361
ok 24 - diff driver 'fortran'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4362
ok 25 - diff driver 'html'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4363
ok 26 - diff driver 'java'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4364
ok 27 - diff driver 'matlab'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4365
ok 28 - diff driver 'objc'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4366
ok 29 - diff driver 'pascal'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4367
ok 30 - diff driver 'perl'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4368
ok 31 - diff driver 'php'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4369
ok 32 - diff driver 'python'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4370
ok 33 - diff driver 'ruby'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4371
ok 34 - diff driver 'tex'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4372
ok 35 - word-diff with diff.sbe
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4373
ok 36 - word-diff with no newline at EOF
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4374
# passed all 36 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4375
1..36
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4376
*** t4035-diff-quiet.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4377
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4378
ok 2 - git diff-tree HEAD^ HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4379
ok 3 - git diff-tree HEAD^ HEAD -- a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4380
ok 4 - git diff-tree HEAD^ HEAD -- b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4381
ok 5 - echo HEAD | git diff-tree --stdin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4382
ok 6 - git diff-tree HEAD HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4383
ok 7 - git diff-files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4384
ok 8 - git diff-index --cached HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4385
ok 9 - git diff-index --cached HEAD^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4386
ok 10 - git diff-index --cached HEAD^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4387
ok 11 - git diff-tree -Stext HEAD^ HEAD -- b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4388
ok 12 - git diff-tree -Snot-found HEAD^ HEAD -- b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4389
ok 13 - git diff-files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4390
ok 14 - git diff-index --cached HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4391
# passed all 14 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4392
1..14
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4393
*** t4036-format-patch-signer-mime.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4394
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4395
ok 2 - format normally
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4396
ok 3 - format with signoff without funny signer name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4397
ok 4 - format with non ASCII signer name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4398
ok 5 - attach and signoff do not duplicate mime headers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4399
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4400
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4401
*** t4037-diff-r-t-dirs.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4402
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4403
ok 2 - verify
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4404
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4405
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4406
*** t4038-diff-combined.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4407
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4408
ok 2 - check combined output (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4409
ok 3 - check combined output (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4410
ok 4 - diagnose truncated file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4411
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4412
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4413
*** t4039-diff-assume-unchanged.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4414
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4415
ok 2 - diff-index does not examine assume-unchanged entries
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4416
ok 3 - diff-files does not examine assume-unchanged entries
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4417
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4418
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4419
*** t4040-whitespace-status.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4420
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4421
ok 2 - diff-tree --exit-code
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4422
ok 3 - diff-tree -b --exit-code
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4423
ok 4 - diff-index --cached --exit-code
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4424
ok 5 - diff-index -b -p --cached --exit-code
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4425
ok 6 - diff-index --exit-code
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4426
ok 7 - diff-index -b -p --exit-code
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4427
ok 8 - diff-files --exit-code
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4428
ok 9 - diff-files -b -p --exit-code
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4429
ok 10 - diff-files --diff-filter --quiet
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4430
ok 11 - diff-tree --diff-filter --quiet
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4431
# passed all 11 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4432
1..11
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4433
*** t4041-diff-submodule-option.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4434
ok 1 - added submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4435
ok 2 - modified submodule(forward)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4436
ok 3 - modified submodule(forward)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4437
ok 4 - modified submodule(forward) --submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4438
ok 5 - modified submodule(forward) --submodule=short
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4439
ok 6 - modified submodule(backward)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4440
ok 7 - modified submodule(backward and forward)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4441
ok 8 - typechanged submodule(submodule->blob), --cached
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4442
ok 9 - typechanged submodule(submodule->blob)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4443
ok 10 - typechanged submodule(submodule->blob)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4444
ok 11 - nonexistent commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4445
ok 12 - typechanged submodule(blob->submodule)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4446
ok 13 - submodule is up to date
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4447
ok 14 - submodule contains untracked content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4448
ok 15 - submodule contains untracked content (untracked ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4449
ok 16 - submodule contains untracked content (dirty ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4450
ok 17 - submodule contains untracked content (all ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4451
ok 18 - submodule contains untracked and modifed content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4452
ok 19 - submodule contains untracked and modifed content (untracked ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4453
ok 20 - submodule contains untracked and modifed content (dirty ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4454
ok 21 - submodule contains untracked and modifed content (all ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4455
ok 22 - submodule contains modifed content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4456
ok 23 - submodule is modified
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4457
ok 24 - modified submodule contains untracked content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4458
ok 25 - modified submodule contains untracked content (untracked ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4459
ok 26 - modified submodule contains untracked content (dirty ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4460
ok 27 - modified submodule contains untracked content (all ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4461
ok 28 - modified submodule contains untracked and modifed content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4462
ok 29 - modified submodule contains untracked and modifed content (untracked ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4463
ok 30 - modified submodule contains untracked and modifed content (dirty ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4464
ok 31 - modified submodule contains untracked and modifed content (all ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4465
ok 32 - modified submodule contains modifed content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4466
ok 33 - deleted submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4467
ok 34 - multiple submodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4468
ok 35 - path filter
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4469
ok 36 - given commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4470
ok 37 - given commit --submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4471
ok 38 - given commit --submodule=short
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4472
ok 39 - setup .git file for sm2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4473
ok 40 - diff --submodule with .git file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4474
# passed all 40 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4475
1..40
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4476
*** t4042-diff-textconv-caching.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4477
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4478
ok 2 - first textconv works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4479
ok 3 - cached textconv produces same output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4480
ok 4 - cached textconv does not run helper
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4481
ok 5 - changing textconv invalidates cache
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4482
ok 6 - switching diff driver produces correct results
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4483
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4484
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4485
*** t4043-diff-rename-binary.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4486
ok 1 - prepare repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4487
ok 2 - move the files into a "sub" directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4488
ok 3 - git show -C -C report renames
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4489
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4490
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4491
*** t4044-diff-index-unique-abbrev.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4492
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4493
ok 2 - diff does not produce ambiguous index line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4494
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4495
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4496
*** t4045-diff-relative.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4497
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4498
ok 2 - -p --relative=subdir/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4499
ok 3 - -p --relative=subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4500
ok 4 - -p --relative=sub
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4501
ok 5 - --stat --relative=subdir/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4502
ok 6 - --stat --relative=subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4503
ok 7 - --stat --relative=sub
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4504
ok 8 - --raw --relative=subdir/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4505
ok 9 - --raw --relative=subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4506
ok 10 - --raw --relative=sub
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4507
# passed all 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4508
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4509
*** t4046-diff-unmerged.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4510
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4511
ok 2 - diff-files -0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4512
ok 3 - diff-files -1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4513
ok 4 - diff-files -2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4514
ok 5 - diff-files -3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4515
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4516
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4517
*** t4047-diff-dirstat.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4518
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4519
ok 2 - sanity check setup (--stat)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4520
ok 3 - various ways to misspell --dirstat
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4521
ok 4 - vanilla --dirstat
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4522
ok 5 - vanilla -X
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4523
ok 6 - explicit defaults: --dirstat=changes,noncumulative,3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4524
ok 7 - explicit defaults: -Xchanges,noncumulative,3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4525
ok 8 - later options override earlier options:
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4526
ok 9 - non-defaults in config overridden by explicit defaults on command line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4527
ok 10 - --dirstat=0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4528
ok 11 - -X0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4529
ok 12 - diff.dirstat=0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4530
ok 13 - --dirstat=0 --cumulative
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4531
ok 14 - --dirstat=0,cumulative
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4532
ok 15 - -X0,cumulative
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4533
ok 16 - diff.dirstat=0,cumulative
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4534
ok 17 - diff.dirstat=0 & --dirstat=cumulative
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4535
ok 18 - --dirstat-by-file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4536
ok 19 - --dirstat=files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4537
ok 20 - diff.dirstat=files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4538
ok 21 - --dirstat-by-file=10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4539
ok 22 - --dirstat=files,10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4540
ok 23 - diff.dirstat=10,files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4541
ok 24 - --dirstat-by-file --cumulative
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4542
ok 25 - --dirstat=files,cumulative
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4543
ok 26 - diff.dirstat=cumulative,files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4544
ok 27 - --dirstat=files,cumulative,10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4545
ok 28 - diff.dirstat=10,cumulative,files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4546
ok 29 - --dirstat=files,cumulative,16.7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4547
ok 30 - diff.dirstat=16.7,cumulative,files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4548
ok 31 - diff.dirstat=16.70,cumulative,files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4549
ok 32 - --dirstat=files,cumulative,27.2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4550
ok 33 - --dirstat=files,cumulative,27.09
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4551
ok 34 - --dirstat=lines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4552
ok 35 - diff.dirstat=lines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4553
ok 36 - --dirstat=lines,0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4554
ok 37 - diff.dirstat=0,lines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4555
ok 38 - --dirstat=future_param,lines,0 should fail loudly
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4556
ok 39 - --dirstat=dummy1,cumulative,2dummy should report both unrecognized parameters
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4557
ok 40 - diff.dirstat=future_param,0,lines should warn, but still work
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4558
# passed all 40 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4559
1..40
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4560
*** t4048-diff-combined-binary.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4561
ok 1 - setup binary merge conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4562
ok 2 - diff -m indicates binary-ness
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4563
ok 3 - diff -c indicates binary-ness
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4564
ok 4 - diff --cc indicates binary-ness
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4565
ok 5 - setup non-binary with binary attribute
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4566
ok 6 - diff -m respects binary attribute
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4567
ok 7 - diff -c respects binary attribute
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4568
ok 8 - diff --cc respects binary attribute
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4569
ok 9 - setup textconv attribute
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4570
ok 10 - diff -m respects textconv attribute
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4571
ok 11 - diff -c respects textconv attribute
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4572
ok 12 - diff --cc respects textconv attribute
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4573
ok 13 - diff-tree plumbing does not respect textconv
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4574
ok 14 - diff --cc respects textconv on worktree file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4575
# passed all 14 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4576
1..14
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4577
*** t4049-diff-stat-count.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4578
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4579
# passed all 1 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4580
1..1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4581
*** t4050-diff-histogram.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4582
ok 1 - histogram diff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4583
ok 2 - histogram diff output is valid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4584
ok 3 - completely different files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4585
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4586
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4587
*** t4051-diff-function-context.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4588
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4589
ok 2 - diff -U0 -W
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4590
ok 3 - diff -W
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4591
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4592
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4593
*** t4100-apply-stat.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4594
ok 1 - rename
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4595
ok 2 - rename with recount
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4596
ok 3 - copy
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4597
ok 4 - copy with recount
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4598
ok 5 - rewrite
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4599
ok 6 - rewrite with recount
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4600
ok 7 - mode
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4601
ok 8 - mode with recount
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4602
ok 9 - non git (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4603
ok 10 - non git (1) with recount
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4604
ok 11 - non git (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4605
ok 12 - non git (2) with recount
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4606
ok 13 - non git (3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4607
ok 14 - non git (3) with recount
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4608
ok 15 - incomplete (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4609
ok 16 - incomplete (1) with recount
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4610
ok 17 - incomplete (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4611
ok 18 - incomplete (2) with recount
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4612
# passed all 18 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4613
1..18
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4614
*** t4101-apply-nonl.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4615
ok 1 - apply diff between 0 and 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4616
ok 2 - apply diff between 0 and 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4617
ok 3 - apply diff between 0 and 3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4618
ok 4 - apply diff between 1 and 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4619
ok 5 - apply diff between 1 and 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4620
ok 6 - apply diff between 1 and 3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4621
ok 7 - apply diff between 2 and 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4622
ok 8 - apply diff between 2 and 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4623
ok 9 - apply diff between 2 and 3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4624
ok 10 - apply diff between 3 and 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4625
ok 11 - apply diff between 3 and 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4626
ok 12 - apply diff between 3 and 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4627
# passed all 12 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4628
1..12
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4629
*** t4102-apply-rename.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4630
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4631
ok 2 - apply
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4632
ok 3 - validate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4633
ok 4 - apply reverse
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4634
ok 5 - apply copy
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4635
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4636
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4637
*** t4103-apply-binary.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4638
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4639
ok 2 - stat binary diff -- should not fail.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4640
ok 3 - stat binary diff (copy) -- should not fail.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4641
ok 4 - check binary diff -- should fail.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4642
ok 5 - check binary diff (copy) -- should fail.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4643
ok 6 - check incomplete binary diff with replacement -- should fail.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4644
ok 7 - check incomplete binary diff with replacement (copy) -- should fail.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4645
ok 8 - check binary diff with replacement.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4646
ok 9 - check binary diff with replacement (copy).
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4647
ok 10 - apply binary diff -- should fail.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4648
ok 11 - apply binary diff -- should fail.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4649
ok 12 - apply binary diff (copy) -- should fail.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4650
ok 13 - apply binary diff (copy) -- should fail.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4651
ok 14 - apply binary diff with full-index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4652
ok 15 - apply binary diff with full-index (copy)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4653
ok 16 - apply full-index binary diff in new repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4654
ok 17 - apply binary diff without replacement.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4655
ok 18 - apply binary diff without replacement (copy).
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4656
ok 19 - apply binary diff.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4657
ok 20 - apply binary diff (copy).
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4658
# passed all 20 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4659
1..20
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4660
*** t4104-apply-boundary.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4661
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4662
ok 2 - apply add-a-patch with context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4663
ok 3 - apply add-z-patch with context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4664
ok 4 - apply insert-a-patch with context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4665
ok 5 - apply mod-a-patch with context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4666
ok 6 - apply mod-z-patch with context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4667
ok 7 - apply del-a-patch with context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4668
ok 8 - apply del-z-patch with context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4669
ok 9 - apply add-a-patch without context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4670
ok 10 - apply add-z-patch without context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4671
ok 11 - apply insert-a-patch without context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4672
ok 12 - apply mod-a-patch without context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4673
ok 13 - apply mod-z-patch without context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4674
ok 14 - apply del-a-patch without context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4675
ok 15 - apply del-z-patch without context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4676
ok 16 - apply non-git add-a-patch without context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4677
ok 17 - apply non-git add-z-patch without context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4678
ok 18 - apply non-git insert-a-patch without context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4679
ok 19 - apply non-git mod-a-patch without context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4680
ok 20 - apply non-git mod-z-patch without context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4681
ok 21 - apply non-git del-a-patch without context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4682
ok 22 - apply non-git del-z-patch without context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4683
ok 23 - two lines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4684
ok 24 - apply patch with 3 context lines matching at end
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4685
# passed all 24 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4686
1..24
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4687
*** t4105-apply-fuzz.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4688
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4689
ok 2 - unmodified patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4690
ok 3 - minus offset
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4691
ok 4 - plus offset
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4692
ok 5 - big offset
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4693
ok 6 - fuzz with no offset
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4694
ok 7 - fuzz with minus offset
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4695
ok 8 - fuzz with plus offset
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4696
ok 9 - fuzz with big offset
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4697
# passed all 9 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4698
1..9
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4699
*** t4106-apply-stdin.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4700
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4701
ok 2 - git apply --numstat - < patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4702
ok 3 - git apply --numstat - < patch patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4703
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4704
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4705
*** t4107-apply-ignore-whitespace.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4706
ok 1 - file creation
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4707
ok 2 - patch2 fails (retab)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4708
ok 3 - patch2 applies with --ignore-whitespace
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4709
ok 4 - patch2 reverse applies with --ignore-space-change
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4710
ok 5 - patch2 applies (apply.ignorewhitespace = change)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4711
ok 6 - patch3 fails (missing string at EOL)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4712
ok 7 - patch4 fails (missing EOL at EOF)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4713
ok 8 - patch5 applies (leading whitespace)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4714
ok 9 - patches do not mangle whitespace
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4715
ok 10 - re-create file (with --ignore-whitespace)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4716
ok 11 - patch5 fails (--no-ignore-whitespace)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4717
# passed all 11 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4718
1..11
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4719
*** t4109-apply-multifrag.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4720
ok 1 - git apply (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4721
ok 2 - git apply (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4722
ok 3 - git apply (3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4723
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4724
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4725
*** t4110-apply-scan.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4726
ok 1 - git apply scan
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4727
# passed all 1 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4728
1..1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4729
*** t4111-apply-subdir.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4730
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4731
ok 2 - setup: subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4732
ok 3 - apply from subdir of toplevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4733
ok 4 - apply --cached from subdir of toplevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4734
ok 5 - apply --index from subdir of toplevel
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4735
ok 6 - apply from .git dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4736
ok 7 - apply from subdir of .git dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4737
ok 8 - apply --cached from .git dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4738
ok 9 - apply --cached from subdir of .git dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4739
# passed all 9 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4740
1..9
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4741
*** t4112-apply-renames.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4742
ok 1 - check rename/copy patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4743
ok 2 - apply rename/copy patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4744
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4745
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4746
*** t4113-apply-ending.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4747
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4748
ok 2 - apply at the end
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4749
ok 3 - apply at the beginning
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4750
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4751
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4752
*** t4114-apply-typechange.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4753
ok 1 - setup repository and commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4754
ok 2 - file renamed from foo to foo/baz
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4755
ok 3 - file renamed from foo/baz to foo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4756
ok 4 - directory becomes file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4757
ok 5 - file becomes directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4758
ok 6 - file becomes symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4759
ok 7 - symlink becomes file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4760
ok 8 - binary file becomes symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4761
ok 9 - symlink becomes binary file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4762
ok 10 - symlink becomes directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4763
ok 11 - directory becomes symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4764
# passed all 11 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4765
1..11
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4766
*** t4115-apply-symlink.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4767
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4768
ok 2 - apply symlink patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4769
ok 3 - apply --index symlink patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4770
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4771
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4772
*** t4116-apply-reverse.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4773
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4774
ok 2 - apply in forward
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4775
ok 3 - apply in reverse
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4776
ok 4 - setup separate repository lacking postimage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4777
ok 5 - apply in forward without postimage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4778
ok 6 - apply in reverse without postimage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4779
ok 7 - reversing a whitespace introduction
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4780
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4781
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4782
*** t4117-apply-reject.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4783
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4784
ok 2 - apply without --reject should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4785
ok 3 - apply without --reject should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4786
ok 4 - apply with --reject should fail but update the file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4787
ok 5 - apply with --reject should fail but update the file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4788
ok 6 - the same test with --verbose
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4789
ok 7 - apply cleanly with --verbose
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4790
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4791
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4792
*** t4118-apply-empty-context.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4793
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4794
ok 2 - apply --numstat
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4795
ok 3 - apply --apply
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4796
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4797
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4798
*** t4119-apply-config.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4799
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4800
ok 2 - apply --whitespace=strip
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4801
ok 3 - apply --whitespace=strip from config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4802
ok 4 - apply --whitespace=strip in subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4803
ok 5 - apply --whitespace=strip from config in subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4804
ok 6 - same in subdir but with traditional patch input
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4805
ok 7 - same but with traditional patch input of depth 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4806
ok 8 - same but with traditional patch input of depth 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4807
ok 9 - same but with traditional patch input of depth 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4808
ok 10 - same but with traditional patch input of depth 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4809
# passed all 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4810
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4811
*** t4120-apply-popt.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4812
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4813
ok 2 - apply git diff with -p2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4814
ok 3 - apply with too large -p
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4815
ok 4 - apply (-p2) traditional diff with funny filenames
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4816
ok 5 - apply with too large -p and fancy filename
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4817
ok 6 - apply (-p2) diff, mode change only
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4818
ok 7 - file mode was changed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4819
ok 8 - apply (-p2) diff, rename
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4820
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4821
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4822
*** t4121-apply-diffs.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4823
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4824
ok 2 - check if contextually independent diffs for the same file apply
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4825
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4826
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4827
*** t4122-apply-symlink-inside.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4828
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4829
ok 2 - apply
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4830
ok 3 - check result
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4831
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4832
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4833
*** t4123-apply-shrink.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4834
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4835
ok 2 - apply should fail gracefully
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4836
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4837
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4838
*** t4124-apply-ws-rule.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4839
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4840
ok 2 - whitespace=nowarn, default rule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4841
ok 3 - whitespace=warn, default rule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4842
ok 4 - whitespace=error-all, default rule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4843
ok 5 - whitespace=error-all, no rule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4844
ok 6 - whitespace=error-all, no rule (attribute)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4845
ok 7 - spaces inserted by tab-in-indent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4846
ok 8 - rule=-trailing,-space,-indent,-tab
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4847
ok 9 - rule=-trailing,-space,-indent,-tab,tabwidth=16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4848
ok 10 - rule=-trailing,-space,-indent,-tab (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4849
ok 11 - rule=-trailing,-space,-indent,-tab,tabwidth=16 (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4850
ok 12 - rule=-trailing,-space,-indent,tab
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4851
ok 13 - rule=-trailing,-space,-indent,tab,tabwidth=16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4852
ok 14 - rule=-trailing,-space,-indent,tab (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4853
ok 15 - rule=-trailing,-space,-indent,tab,tabwidth=16 (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4854
ok 16 - rule=-trailing,-space,indent,-tab
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4855
ok 17 - rule=-trailing,-space,indent,-tab,tabwidth=16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4856
ok 18 - rule=-trailing,-space,indent,-tab (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4857
ok 19 - rule=-trailing,-space,indent,-tab,tabwidth=16 (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4858
ok 20 - rule=-trailing,space,-indent,-tab
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4859
ok 21 - rule=-trailing,space,-indent,-tab,tabwidth=16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4860
ok 22 - rule=-trailing,space,-indent,-tab (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4861
ok 23 - rule=-trailing,space,-indent,-tab,tabwidth=16 (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4862
ok 24 - rule=-trailing,space,-indent,tab
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4863
ok 25 - rule=-trailing,space,-indent,tab,tabwidth=16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4864
ok 26 - rule=-trailing,space,-indent,tab (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4865
ok 27 - rule=-trailing,space,-indent,tab,tabwidth=16 (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4866
ok 28 - rule=-trailing,space,indent,-tab
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4867
ok 29 - rule=-trailing,space,indent,-tab,tabwidth=16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4868
ok 30 - rule=-trailing,space,indent,-tab (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4869
ok 31 - rule=-trailing,space,indent,-tab,tabwidth=16 (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4870
ok 32 - rule=trailing,-space,-indent,-tab
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4871
ok 33 - rule=trailing,-space,-indent,-tab,tabwidth=16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4872
ok 34 - rule=trailing,-space,-indent,-tab (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4873
ok 35 - rule=trailing,-space,-indent,-tab,tabwidth=16 (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4874
ok 36 - rule=trailing,-space,-indent,tab
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4875
ok 37 - rule=trailing,-space,-indent,tab,tabwidth=16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4876
ok 38 - rule=trailing,-space,-indent,tab (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4877
ok 39 - rule=trailing,-space,-indent,tab,tabwidth=16 (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4878
ok 40 - rule=trailing,-space,indent,-tab
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4879
ok 41 - rule=trailing,-space,indent,-tab,tabwidth=16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4880
ok 42 - rule=trailing,-space,indent,-tab (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4881
ok 43 - rule=trailing,-space,indent,-tab,tabwidth=16 (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4882
ok 44 - rule=trailing,space,-indent,-tab
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4883
ok 45 - rule=trailing,space,-indent,-tab,tabwidth=16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4884
ok 46 - rule=trailing,space,-indent,-tab (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4885
ok 47 - rule=trailing,space,-indent,-tab,tabwidth=16 (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4886
ok 48 - rule=trailing,space,-indent,tab
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4887
ok 49 - rule=trailing,space,-indent,tab,tabwidth=16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4888
ok 50 - rule=trailing,space,-indent,tab (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4889
ok 51 - rule=trailing,space,-indent,tab,tabwidth=16 (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4890
ok 52 - rule=trailing,space,indent,-tab
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4891
ok 53 - rule=trailing,space,indent,-tab,tabwidth=16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4892
ok 54 - rule=trailing,space,indent,-tab (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4893
ok 55 - rule=trailing,space,indent,-tab,tabwidth=16 (attributes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4894
ok 56 - trailing whitespace & no newline at the end of file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4895
ok 57 - blank at EOF with --whitespace=fix (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4896
ok 58 - blank at EOF with --whitespace=fix (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4897
ok 59 - blank at EOF with --whitespace=fix (3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4898
ok 60 - blank at end of hunk, not at EOF with --whitespace=fix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4899
ok 61 - blank at EOF with --whitespace=warn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4900
ok 62 - blank at EOF with --whitespace=error
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4901
ok 63 - blank but not empty at EOF
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4902
ok 64 - applying beyond EOF requires one non-blank context line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4903
ok 65 - tons of blanks at EOF should not apply
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4904
ok 66 - missing blank line at end with --whitespace=fix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4905
ok 67 - two missing blank lines at end with --whitespace=fix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4906
ok 68 - missing blank line at end, insert before end, --whitespace=fix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4907
ok 69 - shrink file with tons of missing blanks at end of file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4908
ok 70 - missing blanks at EOF must only match blank lines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4909
ok 71 - missing blank line should match context line with spaces
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4910
ok 72 - same, but with the --ignore-space-option
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4911
ok 73 - same, but with CR-LF line endings && cr-at-eol set
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4912
ok 74 - same, but with CR-LF line endings && cr-at-eol unset
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4913
# passed all 74 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4914
1..74
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4915
*** t4125-apply-ws-fuzz.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4916
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4917
ok 2 - nofix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4918
ok 3 - withfix (forward)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4919
ok 4 - withfix (backward)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4920
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4921
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4922
*** t4126-apply-empty.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4923
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4924
ok 2 - apply empty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4925
ok 3 - apply --index empty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4926
ok 4 - apply create
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4927
ok 5 - apply --index create
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4928
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4929
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4930
*** t4127-apply-same-fn.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4931
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4932
ok 2 - apply same filename with independent changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4933
ok 3 - apply same filename with overlapping changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4934
ok 4 - apply same new filename after rename
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4935
ok 5 - apply same old filename after rename -- should fail.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4936
ok 6 - apply A->B (rename), C->A (rename), A->A -- should pass.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4937
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4938
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4939
*** t4128-apply-root.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4940
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4941
ok 2 - apply --directory -p (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4942
ok 3 - apply --directory -p (2) 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4943
ok 4 - apply --directory (new file)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4944
ok 5 - apply --directory -p (new file)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4945
ok 6 - apply --directory (delete file)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4946
ok 7 - apply --directory (quoted filename)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4947
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4948
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4949
*** t4129-apply-samemode.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4950
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4951
ok 2 - same mode (no index)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4952
ok 3 - same mode (with index)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4953
ok 4 - same mode (index only)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4954
ok 5 - mode update (no index)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4955
ok 6 - mode update (with index)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4956
ok 7 - mode update (index only)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4957
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4958
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4959
*** t4130-apply-criss-cross-rename.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4960
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4961
ok 2 - criss-cross rename
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4962
ok 3 - diff -M -B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4963
ok 4 - apply
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4964
ok 5 - criss-cross rename
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4965
ok 6 - diff -M -B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4966
ok 7 - apply
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4967
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4968
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4969
*** t4131-apply-fake-ancestor.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4970
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4971
ok 2 - apply --build-fake-ancestor
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4972
ok 3 - apply --build-fake-ancestor in a subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4973
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4974
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4975
*** t4132-apply-removal.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4976
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4977
ok 2 - test addEast.patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4978
ok 3 - test addGMT.patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4979
ok 4 - test addWest.patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4980
ok 5 - test createEast.patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4981
ok 6 - test createGMT.patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4982
ok 7 - test createWest.patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4983
ok 8 - test emptyEast.patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4984
ok 9 - test emptyGMT.patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4985
ok 10 - test emptyWest.patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4986
ok 11 - test removeEast.patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4987
ok 12 - test removeGMT.patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4988
ok 13 - test removeWest.patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4989
ok 14 - test removeWest2.patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4990
# passed all 14 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4991
1..14
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4992
*** t4133-apply-filenames.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4993
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4994
ok 2 - apply diff with inconsistent filenames in headers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4995
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4996
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4997
*** t4134-apply-submodule.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4998
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  4999
ok 2 - removing a submodule also removes all leading subdirectories
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5000
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5001
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5002
*** t4135-apply-weird-filenames.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5003
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5004
ok 2 - plain, git-style file creation patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5005
ok 3 - plain, traditional patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5006
ok 4 - plain, traditional file creation patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5007
ok 5 - with spaces, git-style file creation patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5008
ok 6 - with spaces, traditional patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5009
ok 7 - with spaces, traditional file creation patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5010
ok 8 - with tab, git-style file creation patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5011
ok 9 - with tab, traditional patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5012
ok 10 - with tab, traditional file creation patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5013
ok 11 - with backslash, git-style file creation patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5014
ok 12 - with backslash, traditional patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5015
ok 13 - with backslash, traditional file creation patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5016
ok 14 - with quote, git-style file creation patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5017
not ok 15 - with quote, traditional patch # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5018
ok 16 - with quote, traditional file creation patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5019
ok 17 - whitespace-damaged traditional patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5020
ok 18 - traditional patch with colon in timezone
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5021
ok 19 - traditional, whitespace-damaged, colon in timezone
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5022
# still have 1 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5023
# passed all remaining 18 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5024
1..19
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5025
*** t4136-apply-check.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5026
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5027
ok 2 - apply --check exits non-zero with unrecognized input
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5028
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5029
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5030
*** t4150-am.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5031
ok 1 - setup: messages
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5032
ok 2 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5033
ok 3 - am applies patch correctly
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5034
ok 4 - am applies patch e-mail not in a mbox
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5035
ok 5 - am applies patch e-mail not in a mbox with CRLF
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5036
ok 6 - am applies patch e-mail with preceding whitespace
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5037
ok 7 - setup: new author and committer
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5038
ok 8 - am changes committer and keeps author
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5039
ok 9 - am --signoff adds Signed-off-by: line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5040
ok 10 - am stays in branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5041
ok 11 - am --signoff does not add Signed-off-by: line if already there
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5042
ok 12 - am without --keep removes Re: and [PATCH] stuff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5043
ok 13 - am --keep really keeps the subject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5044
ok 14 - am -3 falls back to 3-way merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5045
ok 15 - am can rename a file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5046
ok 16 - am -3 can rename a file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5047
ok 17 - am -3 can rename a file after falling back to 3-way merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5048
ok 18 - am -3 -q is quiet
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5049
ok 19 - am pauses on conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5050
ok 20 - am --skip works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5051
ok 21 - am --resolved works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5052
ok 22 - am takes patches from a Pine mailbox
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5053
ok 23 - am fails on mail without patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5054
ok 24 - am fails on empty patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5055
ok 25 - am works from stdin in subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5056
ok 26 - am works from file (relative path given) in subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5057
ok 27 - am works from file (absolute path given) in subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5058
ok 28 - am --committer-date-is-author-date
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5059
ok 29 - am without --committer-date-is-author-date
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5060
ok 30 - am --ignore-date
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5061
ok 31 - am into an unborn branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5062
ok 32 - am newline in subject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5063
ok 33 - am -q is quiet
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5064
# passed all 33 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5065
1..33
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5066
*** t4151-am-abort.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5067
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5068
ok 2 - am stops at a patch that does not apply
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5069
ok 3 - am --skip continue after failed am
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5070
ok 4 - am --abort goes back after failed am
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5071
ok 5 - am -3 stops at a patch that does not apply
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5072
ok 6 - am -3 --skip continue after failed am -3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5073
ok 7 - am --abort goes back after failed am -3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5074
ok 8 - am --abort will keep the local commits intact
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5075
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5076
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5077
*** t4152-am-subjects.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5078
ok 1 - setup baseline commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5079
ok 2 - create patches with short subject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5080
ok 3 - create patches with long subject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5081
ok 4 - create patches with multiline subject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5082
ok 5 - short subject preserved (format-patch | am)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5083
ok 6 - short subject preserved (format-patch -k | am)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5084
ok 7 - short subject preserved (format-patch -k | am -k)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5085
ok 8 - long subject preserved (format-patch | am)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5086
ok 9 - long subject preserved (format-patch -k | am)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5087
ok 10 - long subject preserved (format-patch -k | am -k)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5088
ok 11 - multiline subject unwrapped (format-patch | am)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5089
ok 12 - multiline subject unwrapped (format-patch -k | am)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5090
ok 13 - multiline subject preserved (format-patch -k | am -k)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5091
# passed all 13 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5092
1..13
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5093
*** t4200-rerere.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5094
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5095
ok 2 - nothing recorded without rerere
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5096
ok 3 - activate rerere, old style (conflicting merge)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5097
ok 4 - rerere.enabled works, too
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5098
ok 5 - set up rr-cache
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5099
ok 6 - rr-cache looks sane
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5100
ok 7 - rerere diff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5101
ok 8 - rerere status
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5102
ok 9 - first postimage wins
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5103
ok 10 - rerere updates postimage timestamp
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5104
ok 11 - rerere clear
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5105
ok 12 - set up for garbage collection tests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5106
ok 13 - gc preserves young or recently used records
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5107
ok 14 - old records rest in peace
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5108
ok 15 - setup: file2 added differently in two branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5109
ok 16 - resolution was recorded properly
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5110
ok 17 - rerere.autoupdate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5111
ok 18 - merge --rerere-autoupdate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5112
ok 19 - merge --no-rerere-autoupdate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5113
ok 20 - set up an unresolved merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5114
ok 21 - explicit rerere
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5115
ok 22 - explicit rerere with autoupdate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5116
ok 23 - explicit rerere --rerere-autoupdate overrides
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5117
ok 24 - rerere --no-no-rerere-autoupdate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5118
ok 25 - rerere -h
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5119
# passed all 25 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5120
1..25
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5121
*** t4201-shortlog.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5122
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5123
ok 2 - default output format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5124
ok 3 - pretty format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5125
ok 4 - --abbrev
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5126
ok 5 - output from user-defined format is re-wrapped
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5127
ok 6 - shortlog wrapping
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5128
ok 7 - shortlog from non-git directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5129
ok 8 - shortlog encoding
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5130
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5131
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5132
*** t4202-log.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5133
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5134
ok 2 - pretty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5135
ok 3 - pretty (tformat)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5136
ok 4 - pretty (shortcut)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5137
ok 5 - format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5138
ok 6 - format %w(12,1,2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5139
ok 7 - format %w(,1,2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5140
ok 8 - oneline
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5141
ok 9 - diff-filter=A
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5142
ok 10 - diff-filter=M
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5143
ok 11 - diff-filter=D
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5144
ok 12 - diff-filter=R
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5145
ok 13 - diff-filter=C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5146
ok 14 - git log --follow
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5147
ok 15 - git log --no-walk <commits> sorts by commit time
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5148
ok 16 - git show <commits> leaves list of commits as given
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5149
ok 17 - setup case sensitivity tests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5150
ok 18 - log --grep
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5151
ok 19 - log --grep option parsing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5152
ok 20 - log -i --grep
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5153
ok 21 - log --grep -i
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5154
ok 22 - simple log --graph
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5155
ok 23 - set up merge history
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5156
ok 24 - log --graph with merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5157
ok 25 - log --graph with full output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5158
ok 26 - set up more tangled history
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5159
ok 27 - log --graph with merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5160
ok 28 - log.decorate configuration
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5161
ok 29 - reflog is expected format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5162
ok 30 - whatchanged is expected format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5163
ok 31 - log.abbrevCommit configuration
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5164
ok 32 - show added path under "--follow -M"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5165
# passed all 32 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5166
1..32
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5167
*** t4203-mailmap.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5168
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5169
ok 2 - No mailmap
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5170
ok 3 - default .mailmap
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5171
ok 4 - mailmap.file set
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5172
ok 5 - mailmap.file override
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5173
ok 6 - mailmap.file non-existent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5174
ok 7 - name entry after email entry
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5175
ok 8 - name entry after email entry, case-insensitive
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5176
ok 9 - No mailmap files, but configured
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5177
ok 10 - Shortlog output (complex mapping)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5178
ok 11 - Log output (complex mapping)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5179
ok 12 - Blame output (complex mapping)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5180
# passed all 12 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5181
1..12
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5182
*** t4204-patch-id.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5183
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5184
ok 2 - patch-id output is well-formed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5185
ok 3 - patch-id detects equality
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5186
ok 4 - patch-id detects inequality
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5187
ok 5 - patch-id supports git-format-patch output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5188
ok 6 - whitespace is irrelevant in footer
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5189
ok 7 - patch-id supports git-format-patch MIME output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5190
ok 8 - patch-id handles no-nl-at-eof markers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5191
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5192
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5193
*** t4205-log-pretty-formats.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5194
ok 1 - set up basic repos
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5195
ok 2 - alias builtin format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5196
ok 3 - alias masking builtin format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5197
ok 4 - alias user-defined format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5198
ok 5 - alias user-defined tformat
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5199
ok 6 - alias non-existent format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5200
ok 7 - alias of an alias
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5201
ok 8 - alias masking an alias
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5202
ok 9 - alias loop
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5203
# passed all 9 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5204
1..9
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5205
*** t4206-log-follow-harder-copies.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5206
ok 1 - add a file path0 and commit.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5207
ok 2 - Change path0.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5208
ok 3 - copy path0 to path1.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5209
ok 4 - find the copy path0 -> path1 harder
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5210
ok 5 - validate the output.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5211
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5212
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5213
*** t4207-log-decoration-colors.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5214
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5215
ok 2 - Commit Decorations Colored Correctly
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5216
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5217
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5218
*** t4208-log-magic-pathspec.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5219
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5220
ok 2 - "git log :/" should be ambiguous
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5221
ok 3 - "git log :" should be ambiguous
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5222
ok 4 - git log -- :
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5223
ok 5 - git log HEAD -- :/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5224
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5225
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5226
*** t4252-am-options.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5227
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5228
ok 2 - interrupted am --whitespace=fix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5229
ok 3 - interrupted am -C1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5230
ok 4 - interrupted am -p2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5231
ok 5 - interrupted am -C1 -p2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5232
ok 6 - interrupted am --directory="frotz nitfol"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5233
ok 7 - apply to a funny path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5234
ok 8 - am --reject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5235
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5236
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5237
*** t4253-am-keep-cr-dos.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5238
ok 1 - setup repository with dos files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5239
ok 2 - am with dos files without --keep-cr
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5240
ok 3 - am with dos files with --keep-cr
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5241
ok 4 - am with dos files config am.keepcr
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5242
ok 5 - am with dos files config am.keepcr overriden by --no-keep-cr
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5243
ok 6 - am with dos files with --keep-cr continue
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5244
ok 7 - am with unix files config am.keepcr overriden by --no-keep-cr
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5245
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5246
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5247
*** t4254-am-corrupt.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5248
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5249
ok 2 - try to apply corrupted patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5250
ok 3 - compare diagnostic; ensure file is still here
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5251
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5252
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5253
*** t4300-merge-tree.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5254
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5255
ok 2 - file add A, !B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5256
ok 3 - file add !A, B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5257
ok 4 - file add A, B (same)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5258
ok 5 - file add A, B (different)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5259
ok 6 - file change A, !B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5260
ok 7 - file change !A, B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5261
ok 8 - file change A, B (same)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5262
ok 9 - file change A, B (different)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5263
ok 10 - file change A, B (mixed)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5264
ok 11 - file remove A, !B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5265
ok 12 - file remove !A, B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5266
ok 13 - file change A, remove B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5267
ok 14 - file remove A, change B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5268
# passed all 14 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5269
1..14
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5270
*** t5000-tar-tree.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5271
ok 1 - populate workdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5272
ok 2 - add ignored file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5273
ok 3 - add files to repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5274
ok 4 - create bare clone
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5275
ok 5 - remove ignored file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5276
ok 6 - git archive
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5277
ok 7 - git tar-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5278
ok 8 - git archive vs. git tar-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5279
ok 9 - git archive in a bare repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5280
ok 10 - git archive vs. the same in a bare repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5281
ok 11 - git archive with --output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5282
ok 12 - git archive --remote
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5283
ok 13 - validate file modification time
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5284
ok 14 - git get-tar-commit-id
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5285
ok 15 - extract tar archive
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5286
ok 16 - validate filenames
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5287
ok 17 - validate file contents
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5288
ok 18 - git tar-tree with prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5289
ok 19 - extract tar archive with prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5290
ok 20 - validate filenames with prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5291
ok 21 - validate file contents with prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5292
ok 22 - create archives with substfiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5293
ok 23 - extract substfiles
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5294
ok 24 - validate substfile contents
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5295
ok 25 - extract substfiles from archive with prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5296
ok 26 - validate substfile contents from archive with prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5297
ok 27 - git archive --format=zip
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5298
ok 28 - git archive --format=zip in a bare repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5299
ok 29 - git archive --format=zip vs. the same in a bare repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5300
ok 30 - git archive --format=zip with --output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5301
ok 31 - git archive with --output, inferring format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5302
ok 32 - git archive with --output, override inferred format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5303
ok 33 - extract ZIP archive
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5304
ok 34 - validate filenames
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5305
ok 35 - validate file contents
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5306
ok 36 - git archive --format=zip with prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5307
ok 37 - extract ZIP archive with prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5308
ok 38 - validate filenames with prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5309
ok 39 - validate file contents with prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5310
ok 40 - git archive --list outside of a git repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5311
ok 41 - clients cannot access unreachable commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5312
ok 42 - git-archive --prefix=olde-
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5313
ok 43 - setup tar filters
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5314
ok 44 - archive --list mentions user filter
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5315
ok 45 - archive --list shows only enabled remote filters
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5316
ok 46 - invoke tar filter by format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5317
ok 47 - invoke tar filter by extension
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5318
ok 48 - default output format remains tar
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5319
ok 49 - extension matching requires dot
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5320
ok 50 - only enabled filters are available remotely
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5321
ok 51 - git archive --format=tgz
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5322
ok 52 - git archive --format=tar.gz
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5323
ok 53 - infer tgz from .tgz filename
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5324
ok 54 - infer tgz from .tar.gz filename
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5325
ok 55 - extract tgz file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5326
ok 56 - remote tar.gz is allowed by default
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5327
ok 57 - remote tar.gz can be disabled
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5328
# passed all 57 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5329
1..57
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5330
*** t5001-archive-attr.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5331
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5332
ok 2 - git archive
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5333
ok 3 -  archive/ignored does not exist
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5334
ok 4 -  archive/ignored-by-tree does not exist
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5335
ok 5 -  archive/ignored-by-worktree exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5336
ok 6 - git archive with worktree attributes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5337
ok 7 -  worktree/ignored does not exist
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5338
ok 8 -  worktree/ignored-by-tree exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5339
ok 9 -  worktree/ignored-by-worktree does not exist
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5340
ok 10 - git archive --worktree-attributes option
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5341
ok 11 -  worktree2/ignored does not exist
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5342
ok 12 -  worktree2/ignored-by-tree exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5343
ok 13 -  worktree2/ignored-by-worktree does not exist
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5344
ok 14 - git archive vs. bare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5345
ok 15 - git archive with worktree attributes, bare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5346
ok 16 -  bare-worktree/ignored does not exist
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5347
ok 17 -  bare-worktree/ignored-by-tree exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5348
ok 18 -  bare-worktree/ignored-by-worktree exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5349
ok 19 - export-subst
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5350
ok 20 - git tar-tree vs. git archive with worktree attributes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5351
ok 21 - git tar-tree vs. git archive with worktree attrs, bare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5352
# passed all 21 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5353
1..21
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5354
*** t5100-mailinfo.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5355
ok 1 - split sample box
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5356
ok 2 - mailinfo 0001
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5357
ok 3 - mailinfo 0002
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5358
ok 4 - mailinfo 0003
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5359
ok 5 - mailinfo 0004
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5360
ok 6 - mailinfo 0005
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5361
ok 7 - mailinfo 0006
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5362
ok 8 - mailinfo 0007
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5363
ok 9 - mailinfo 0008
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5364
ok 10 - mailinfo 0009
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5365
ok 11 - mailinfo 0010
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5366
ok 12 - mailinfo 0011
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5367
ok 13 - mailinfo 0012
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5368
ok 14 - mailinfo 0013
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5369
ok 15 - mailinfo 0014
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5370
ok 16 - mailinfo 0015
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5371
ok 17 - mailinfo 0016
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5372
ok 18 - split box with rfc2047 samples
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5373
ok 19 - mailinfo rfc2047/0001
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5374
ok 20 - mailinfo rfc2047/0002
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5375
ok 21 - mailinfo rfc2047/0003
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5376
ok 22 - mailinfo rfc2047/0004
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5377
ok 23 - mailinfo rfc2047/0005
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5378
ok 24 - mailinfo rfc2047/0006
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5379
ok 25 - mailinfo rfc2047/0007
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5380
ok 26 - mailinfo rfc2047/0008
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5381
ok 27 - mailinfo rfc2047/0009
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5382
ok 28 - mailinfo rfc2047/0010
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5383
ok 29 - mailinfo rfc2047/0011
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5384
ok 30 - respect NULs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5385
ok 31 - Preserve NULs out of MIME encoded message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5386
ok 32 - mailinfo on from header without name works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5387
# passed all 32 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5388
1..32
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5389
*** t5150-request-pull.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5390
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5391
ok 2 - setup: two scripts for reading pull requests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5392
ok 3 - pull request when forgot to push
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5393
ok 4 - pull request after push
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5394
ok 5 - request names an appropriate branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5395
ok 6 - pull request format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5396
ok 7 - request-pull ignores OPTIONS_KEEPDASHDASH poison
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5397
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5398
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5399
*** t5300-pack-object.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5400
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5401
ok 2 - pack without delta
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5402
ok 3 - unpack without delta
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5403
ok 4 - check unpack without delta
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5404
ok 5 - pack with REF_DELTA
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5405
ok 6 - unpack with REF_DELTA
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5406
ok 7 - check unpack with REF_DELTA
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5407
ok 8 - pack with OFS_DELTA
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5408
ok 9 - unpack with OFS_DELTA
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5409
ok 10 - check unpack with OFS_DELTA
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5410
ok 11 - compare delta flavors
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5411
ok 12 - use packed objects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5412
ok 13 - use packed deltified (REF_DELTA) objects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5413
ok 14 - use packed deltified (OFS_DELTA) objects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5414
ok 15 - survive missing objects/pack directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5415
ok 16 - verify pack
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5416
ok 17 - verify pack -v
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5417
ok 18 - verify-pack catches mismatched .idx and .pack files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5418
ok 19 - verify-pack catches a corrupted pack signature
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5419
ok 20 - verify-pack catches a corrupted pack version
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5420
ok 21 - verify-pack catches a corrupted type/size of the 1st packed object data
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5421
ok 22 - verify-pack catches a corrupted sum of the index file itself
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5422
ok 23 - build pack index for an existing pack
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5423
ok 24 - unpacking with --strict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5424
ok 25 - index-pack with --strict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5425
ok 26 - honor pack.packSizeLimit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5426
ok 27 - verify resulting packs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5427
ok 28 - tolerate packsizelimit smaller than biggest object
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5428
ok 29 - verify resulting packs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5429
ok 30 - fake a SHA1 hash collision
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5430
ok 31 - make sure index-pack detects the SHA1 collision
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5431
# passed all 31 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5432
1..31
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5433
*** t5301-sliding-window.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5434
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5435
ok 2 - verify-pack -v, defaults
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5436
ok 3 - verify-pack -v, packedGitWindowSize == 1 page
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5437
ok 4 - verify-pack -v, packedGit{WindowSize,Limit} == 1 page
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5438
ok 5 - repack -a -d, packedGit{WindowSize,Limit} == 1 page
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5439
ok 6 - verify-pack -v, defaults
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5440
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5441
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5442
*** t5302-pack-index.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5443
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5444
ok 2 - pack-objects with index version 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5445
ok 3 - pack-objects with index version 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5446
ok 4 - both packs should be identical
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5447
ok 5 - index v1 and index v2 should be different
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5448
ok 6 - index-pack with index version 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5449
ok 7 - index-pack with index version 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5450
ok 8 - index-pack results should match pack-objects ones
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5451
ok 9 - index-pack --verify on index version 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5452
ok 10 - index-pack --verify on index version 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5453
ok 11 - index v2: force some 64-bit offsets with pack-objects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5454
ok 12 - index v2: verify a pack with some 64-bit offsets
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5455
ok 13 - 64-bit offsets: should be different from previous index v2 results
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5456
ok 14 - index v2: force some 64-bit offsets with index-pack
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5457
ok 15 - 64-bit offsets: index-pack result should match pack-objects one
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5458
ok 16 - index-pack --verify on 64-bit offset v2 (cheat)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5459
ok 17 - index-pack --verify on 64-bit offset v2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5460
ok 18 - [index v1] 1) stream pack to repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5461
ok 19 - [index v1] 2) create a stealth corruption in a delta base reference
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5462
ok 20 - [index v1] 3) corrupted delta happily returned wrong data
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5463
ok 21 - [index v1] 4) confirm that the pack is actually corrupted
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5464
ok 22 - [index v1] 5) pack-objects happily reuses corrupted data
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5465
ok 23 - [index v1] 6) newly created pack is BAD !
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5466
ok 24 - [index v2] 1) stream pack to repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5467
ok 25 - [index v2] 2) create a stealth corruption in a delta base reference
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5468
ok 26 - [index v2] 3) corrupted delta happily returned wrong data
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5469
ok 27 - [index v2] 4) confirm that the pack is actually corrupted
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5470
ok 28 - [index v2] 5) pack-objects refuses to reuse corrupted data
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5471
ok 29 - [index v2] 6) verify-pack detects CRC mismatch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5472
ok 30 - running index-pack in the object store
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5473
# passed all 30 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5474
1..30
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5475
*** t5303-pack-corruption-resilience.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5476
ok 1 - initial setup validation
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5477
ok 2 - create corruption in header of first object
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5478
ok 3 - ... but having a loose copy allows for full recovery
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5479
ok 4 - ... and loose copy of first delta allows for partial recovery
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5480
ok 5 - create corruption in data of first object
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5481
ok 6 - ... but having a loose copy allows for full recovery
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5482
ok 7 - ... and loose copy of second object allows for partial recovery
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5483
ok 8 - create corruption in header of first delta
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5484
ok 9 - ... but having a loose copy allows for full recovery
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5485
ok 10 - ... and then a repack "clears" the corruption
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5486
ok 11 - create corruption in data of first delta
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5487
ok 12 - ... but having a loose copy allows for full recovery
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5488
ok 13 - ... and then a repack "clears" the corruption
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5489
ok 14 - corruption in delta base reference of first delta (OBJ_REF_DELTA)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5490
ok 15 - ... but having a loose copy allows for full recovery
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5491
ok 16 - ... and then a repack "clears" the corruption
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5492
ok 17 - corruption #0 in delta base reference of first delta (OBJ_OFS_DELTA)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5493
ok 18 - ... but having a loose copy allows for full recovery
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5494
ok 19 - ... and then a repack "clears" the corruption
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5495
ok 20 - corruption #1 in delta base reference of first delta (OBJ_OFS_DELTA)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5496
ok 21 - ... but having a loose copy allows for full recovery
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5497
ok 22 - ... and then a repack "clears" the corruption
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5498
ok 23 - ... and a redundant pack allows for full recovery too
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5499
ok 24 - corrupting header to have too small output buffer fails unpack
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5500
# passed all 24 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5501
1..24
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5502
*** t5304-prune.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5503
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5504
ok 2 - prune stale packs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5505
ok 3 - prune --expire
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5506
ok 4 - gc: implicit prune --expire
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5507
ok 5 - gc: refuse to start with invalid gc.pruneExpire
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5508
ok 6 - gc: start with ok gc.pruneExpire
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5509
ok 7 - prune: prune nonsense parameters
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5510
ok 8 - prune: prune unreachable heads
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5511
ok 9 - prune: do not prune heads listed as an argument
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5512
ok 10 - gc --no-prune
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5513
ok 11 - gc respects gc.pruneExpire
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5514
ok 12 - gc --prune=<date>
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5515
ok 13 - gc --prune=never
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5516
ok 14 - gc respects gc.pruneExpire=never
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5517
ok 15 - prune --expire=never
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5518
ok 16 - gc: prune old objects after local clone
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5519
# passed all 16 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5520
1..16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5521
*** t5305-include-tag.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5522
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5523
ok 2 - pack without --include-tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5524
ok 3 - unpack objects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5525
ok 4 - check unpacked result (have commit, no tag)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5526
ok 5 - pack with --include-tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5527
ok 6 - unpack objects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5528
ok 7 - check unpacked result (have commit, have tag)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5529
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5530
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5531
*** t5306-pack-nobase.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5532
ok 1 - setup base
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5533
ok 2 - setup patch_clone
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5534
ok 3 - indirectly clone patch_clone
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5535
ok 4 - clone of patch_clone is incomplete
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5536
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5537
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5538
*** t5307-pack-missing-commit.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5539
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5540
ok 2 - check corruption
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5541
ok 3 - rev-list notices corruption (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5542
ok 4 - rev-list notices corruption (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5543
ok 5 - pack-objects notices corruption
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5544
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5545
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5546
*** t5400-send-pack.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5547
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5548
ok 2 - pack the source repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5549
ok 3 - pack the destination repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5550
ok 4 - refuse pushing rewound head without --force
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5551
ok 5 - push can be used to delete a ref
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5552
ok 6 - refuse deleting push with denyDeletes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5553
ok 7 - cannot override denyDeletes with git -c send-pack
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5554
ok 8 - override denyDeletes with git -c receive-pack
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5555
ok 9 - denyNonFastforwards trumps --force
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5556
ok 10 - push --all excludes remote-tracking hierarchy
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5557
ok 11 - pushing explicit refspecs respects forcing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5558
ok 12 - pushing wildcard refspecs respects forcing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5559
ok 13 - deny pushing to delete current branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5560
# passed all 13 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5561
1..13
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5562
*** t5401-update-hooks.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5563
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5564
ok 2 - push
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5565
ok 3 - updated as expected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5566
ok 4 - hooks ran
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5567
ok 5 - pre-receive hook input
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5568
ok 6 - update hook arguments
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5569
ok 7 - post-receive hook input
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5570
ok 8 - post-update hook arguments
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5571
ok 9 - all hook stdin is /dev/null
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5572
ok 10 - all *-receive hook args are empty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5573
ok 11 - send-pack produced no output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5574
ok 12 - send-pack stderr contains hook messages
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5575
# passed all 12 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5576
1..12
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5577
*** t5402-post-merge-hook.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5578
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5579
ok 2 - post-merge does not run for up-to-date 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5580
ok 3 - post-merge runs as expected 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5581
ok 4 - post-merge from normal merge receives the right argument 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5582
ok 5 - post-merge from squash merge runs as expected 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5583
ok 6 - post-merge from squash merge receives the right argument 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5584
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5585
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5586
*** t5403-post-checkout-hook.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5587
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5588
ok 2 - post-checkout runs as expected 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5589
ok 3 - post-checkout receives the right arguments with HEAD unchanged 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5590
ok 4 - post-checkout runs as expected 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5591
ok 5 - post-checkout args are correct with git checkout -b 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5592
ok 6 - post-checkout receives the right args with HEAD changed 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5593
ok 7 - post-checkout receives the right args when not switching branches 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5594
ok 8 - post-checkout hook is triggered by clone
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5595
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5596
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5597
*** t5404-tracking-branches.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5598
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5599
ok 2 - prepare pushable branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5600
ok 3 - mixed-success push returns error
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5601
ok 4 - check tracking branches updated correctly after push
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5602
ok 5 - check tracking branches not updated for failed refs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5603
ok 6 - deleted branches have their tracking branches removed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5604
ok 7 - already deleted tracking branches ignored
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5605
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5606
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5607
*** t5405-send-pack-rewind.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5608
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5609
ok 2 - non forced push should die not segfault
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5610
ok 3 - forced push should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5611
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5612
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5613
*** t5406-remote-rejects.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5614
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5615
ok 2 - push reports error
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5616
ok 3 - individual ref reports error
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5617
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5618
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5619
*** t5407-post-rewrite-hook.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5620
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5621
ok 2 - git commit --amend
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5622
ok 3 - git commit --amend --no-post-rewrite
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5623
ok 4 - git rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5624
ok 5 - git rebase --skip
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5625
ok 6 - git rebase --skip the last one
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5626
ok 7 - git rebase -m
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5627
ok 8 - git rebase -m --skip
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5628
ok 9 - git rebase -i (unchanged)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5629
ok 10 - git rebase -i (skip)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5630
ok 11 - git rebase -i (squash)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5631
ok 12 - git rebase -i (fixup without conflict)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5632
ok 13 - git rebase -i (double edit)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5633
# passed all 13 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5634
1..13
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5635
*** t5500-fetch-pack.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5636
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5637
ok 2 - 1st pull
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5638
ok 3 - post 1st pull setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5639
ok 4 - 2nd pull
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5640
ok 5 - 3rd pull
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5641
ok 6 - clone shallow
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5642
ok 7 - clone shallow object count
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5643
ok 8 - clone shallow object count (part 2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5644
ok 9 - fsck in shallow repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5645
ok 10 - simple fetch in shallow repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5646
ok 11 - no changes expected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5647
ok 12 - fetch same depth in shallow repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5648
ok 13 - no changes expected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5649
ok 14 - add two more
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5650
ok 15 - pull in shallow repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5651
ok 16 - clone shallow object count
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5652
ok 17 - add two more (part 2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5653
ok 18 - deepening pull in shallow repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5654
ok 19 - clone shallow object count
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5655
ok 20 - deepening fetch in shallow repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5656
ok 21 - clone shallow object count
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5657
ok 22 - pull in shallow repo with missing merge base
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5658
ok 23 - additional simple shallow deepenings
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5659
ok 24 - clone shallow object count
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5660
# passed all 24 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5661
1..24
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5662
*** t5501-fetch-push-alternates.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5663
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5664
ok 2 - pushing into a repository with the same alternate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5665
ok 3 - fetching from a repository with the same alternate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5666
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5667
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5668
*** t5502-quickfetch.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5669
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5670
ok 2 - clone without alternate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5671
ok 3 - further commits in the original
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5672
ok 4 - copy commit and tree but not blob by hand
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5673
ok 5 - quickfetch should not leave a corrupted repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5674
ok 6 - quickfetch should not copy from alternate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5675
ok 7 - quickfetch should handle ~1000 refs (on Windows)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5676
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5677
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5678
*** t5503-tagfollow.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5679
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5680
ok 2 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5681
ok 3 - fetch A (new commit : 1 connection)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5682
ok 4 - create tag T on A, create C on branch cat
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5683
ok 5 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5684
ok 6 - fetch C, T (new branch, tag : 1 connection)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5685
ok 7 - create commits O, B, tag S on B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5686
ok 8 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5687
ok 9 - fetch B, S (commit and tag : 1 connection)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5688
ok 10 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5689
ok 11 - new clone fetch master and tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5690
# passed all 11 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5691
1..11
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5692
*** t5504-fetch-receive-strict.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5693
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5694
ok 2 - fetch without strict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5695
ok 3 - fetch with !fetch.fsckobjects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5696
ok 4 - fetch with fetch.fsckobjects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5697
ok 5 - fetch with transfer.fsckobjects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5698
ok 6 - push without strict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5699
ok 7 - push with !receive.fsckobjects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5700
ok 8 - push with receive.fsckobjects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5701
ok 9 - push with transfer.fsckobjects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5702
# passed all 9 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5703
1..9
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5704
*** t5505-remote.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5705
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5706
ok 2 - remote information for the origin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5707
ok 3 - add another remote
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5708
ok 4 - remote forces tracking branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5709
ok 5 - remove remote
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5710
ok 6 - remove remote
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5711
ok 7 - remove remote protects local branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5712
ok 8 - show
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5713
ok 9 - show -n
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5714
ok 10 - prune
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5715
ok 11 - set-head --delete
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5716
ok 12 - set-head --auto
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5717
ok 13 - set-head --auto fails w/multiple HEADs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5718
ok 14 - set-head explicit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5719
ok 15 - prune --dry-run
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5720
ok 16 - add --mirror && prune
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5721
ok 17 - add --mirror=fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5722
ok 18 - fetch mirrors act as mirrors during fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5723
ok 19 - fetch mirrors can prune
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5724
ok 20 - fetch mirrors do not act as mirrors during push
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5725
ok 21 - add fetch mirror with specific branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5726
ok 22 - fetch mirror respects specific branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5727
ok 23 - add --mirror=push
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5728
ok 24 - push mirrors act as mirrors during push
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5729
ok 25 - push mirrors do not act as mirrors during fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5730
ok 26 - push mirrors do not allow you to specify refs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5731
ok 27 - add alt && prune
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5732
ok 28 - add with reachable tags (default)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5733
ok 29 - add --tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5734
ok 30 - add --no-tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5735
ok 31 - reject --no-no-tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5736
ok 32 - update
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5737
ok 33 - update with arguments
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5738
ok 34 - update --prune
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5739
ok 35 - update default
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5740
ok 36 - update default (overridden, with funny whitespace)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5741
ok 37 - update (with remotes.default defined)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5742
ok 38 - "remote show" does not show symbolic refs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5743
ok 39 - reject adding remote with an invalid name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5744
ok 40 - rename a remote
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5745
ok 41 - rename does not update a non-default fetch refspec
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5746
ok 42 - rename a remote with name part of fetch spec
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5747
ok 43 - rename a remote with name prefix of other remote
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5748
ok 44 - migrate a remote from named file in $GIT_DIR/remotes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5749
ok 45 - migrate a remote from named file in $GIT_DIR/branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5750
ok 46 - remote prune to cause a dangling symref
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5751
ok 47 - show empty remote
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5752
ok 48 - remote set-branches requires a remote
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5753
ok 49 - remote set-branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5754
ok 50 - remote set-branches with --mirror
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5755
ok 51 - new remote
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5756
ok 52 - remote set-url bar
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5757
ok 53 - remote set-url baz bar
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5758
ok 54 - remote set-url zot bar
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5759
ok 55 - remote set-url --push zot baz
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5760
ok 56 - remote set-url --push zot
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5761
ok 57 - remote set-url --push qux zot
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5762
ok 58 - remote set-url --push foo qu+x
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5763
ok 59 - remote set-url --push --add aaa
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5764
ok 60 - remote set-url --push bar aaa
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5765
ok 61 - remote set-url --push --delete bar
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5766
ok 62 - remote set-url --push --delete foo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5767
ok 63 - remote set-url --add bbb
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5768
ok 64 - remote set-url --delete .*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5769
ok 65 - remote set-url --delete bbb
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5770
ok 66 - remote set-url --delete baz
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5771
ok 67 - remote set-url --add ccc
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5772
ok 68 - remote set-url --delete baz
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5773
# passed all 68 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5774
1..68
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5775
*** t5506-remote-groups.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5776
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5777
ok 2 - no group updates all
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5778
ok 3 - nonexistent group produces error
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5779
ok 4 - updating group updates all members (remote update)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5780
ok 5 - updating group updates all members (fetch)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5781
ok 6 - updating group does not update non-members (remote update)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5782
ok 7 - updating group does not update non-members (fetch)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5783
ok 8 - updating remote name updates that remote
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5784
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5785
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5786
*** t5509-fetch-push-namespaces.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5787
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5788
ok 2 - pushing into a repository using a ref namespace
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5789
ok 3 - pulling from a repository using a ref namespace
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5790
ok 4 - mirroring a repository using a ref namespace
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5791
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5792
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5793
*** t5510-fetch.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5794
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5795
ok 2 - clone and setup child repos
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5796
ok 3 - fetch test
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5797
ok 4 - fetch test for-merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5798
ok 5 - fetch --prune on its own works as expected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5799
ok 6 - fetch --prune with a branch name keeps branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5800
ok 7 - fetch --prune with a namespace keeps other namespaces
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5801
ok 8 - fetch --prune --tags does not delete the remote-tracking branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5802
ok 9 - fetch --prune --tags with branch does not delete other remote-tracking branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5803
ok 10 - fetch tags when there is no tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5804
ok 11 - fetch following tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5805
ok 12 - fetch must not resolve short tag name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5806
ok 13 - fetch can now resolve short remote name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5807
ok 14 - create bundle 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5808
ok 15 - header of bundle looks right
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5809
ok 16 - create bundle 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5810
ok 17 - unbundle 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5811
ok 18 - bundle 1 has only 3 files 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5812
ok 19 - unbundle 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5813
ok 20 - bundle does not prerequisite objects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5814
ok 21 - bundle should be able to create a full history
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5815
ok 22 - fetch via rsync
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5816
ok 23 - push via rsync
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5817
ok 24 - push via rsync
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5818
ok 25 - fetch with a non-applying branch.<name>.merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5819
ok 26 - fetch from GIT URL with a non-applying branch.<name>.merge [1]
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5820
ok 27 - fetch from GIT URL with a non-applying branch.<name>.merge [2]
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5821
ok 28 - fetch from GIT URL with a non-applying branch.<name>.merge [3]
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5822
ok 29 - quoting of a strangely named repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5823
ok 30 - bundle should record HEAD correctly
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5824
ok 31 - explicit fetch should not update tracking
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5825
ok 32 - explicit pull should not update tracking
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5826
ok 33 - configured fetch updates tracking
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5827
ok 34 - pushing nonexistent branch by mistake should not segv
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5828
ok 35 - auto tag following fetches minimum
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5829
ok 36 - refuse to fetch into the current branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5830
ok 37 - fetch into the current branch with --update-head-ok
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5831
ok 38 - fetch --dry-run
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5832
ok 39 - should be able to fetch with duplicate refspecs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5833
# passed all 39 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5834
1..39
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5835
*** t5511-refspec.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5836
ok 1 - push  (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5837
ok 2 - push :
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5838
ok 3 - push :: (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5839
ok 4 - push +:
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5840
ok 5 - fetch 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5841
ok 6 - fetch :
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5842
ok 7 - fetch :: (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5843
ok 8 - push refs/heads/*:refs/remotes/frotz/*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5844
ok 9 - push refs/heads/*:refs/remotes/frotz (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5845
ok 10 - push refs/heads:refs/remotes/frotz/* (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5846
ok 11 - push refs/heads/master:refs/remotes/frotz/xyzzy
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5847
ok 12 - fetch refs/heads/*:refs/remotes/frotz/*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5848
ok 13 - fetch refs/heads/*:refs/remotes/frotz (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5849
ok 14 - fetch refs/heads:refs/remotes/frotz/* (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5850
ok 15 - fetch refs/heads/master:refs/remotes/frotz/xyzzy
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5851
ok 16 - fetch refs/heads/master::refs/remotes/frotz/xyzzy (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5852
ok 17 - fetch refs/heads/maste :refs/remotes/frotz/xyzzy (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5853
ok 18 - push master~1:refs/remotes/frotz/backup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5854
ok 19 - fetch master~1:refs/remotes/frotz/backup (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5855
ok 20 - push HEAD~4:refs/remotes/frotz/new
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5856
ok 21 - fetch HEAD~4:refs/remotes/frotz/new (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5857
ok 22 - push HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5858
ok 23 - fetch HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5859
ok 24 - push refs/heads/ nitfol (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5860
ok 25 - fetch refs/heads/ nitfol (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5861
ok 26 - push HEAD: (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5862
ok 27 - fetch HEAD:
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5863
ok 28 - push refs/heads/ nitfol: (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5864
ok 29 - fetch refs/heads/ nitfol: (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5865
ok 30 - push :refs/remotes/frotz/deleteme
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5866
ok 31 - fetch :refs/remotes/frotz/HEAD-to-me
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5867
ok 32 - push :refs/remotes/frotz/delete me (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5868
ok 33 - fetch :refs/remotes/frotz/HEAD to me (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5869
ok 34 - fetch refs/heads/*/for-linus:refs/remotes/mine/*-blah (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5870
ok 35 - push refs/heads/*/for-linus:refs/remotes/mine/*-blah (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5871
ok 36 - fetch refs/heads*/for-linus:refs/remotes/mine/* (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5872
ok 37 - push refs/heads*/for-linus:refs/remotes/mine/* (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5873
ok 38 - fetch refs/heads/*/*/for-linus:refs/remotes/mine/* (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5874
ok 39 - push refs/heads/*/*/for-linus:refs/remotes/mine/* (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5875
ok 40 - fetch refs/heads/*/for-linus:refs/remotes/mine/*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5876
ok 41 - push refs/heads/*/for-linus:refs/remotes/mine/*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5877
# passed all 41 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5878
1..41
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5879
*** t5512-ls-remote.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5880
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5881
ok 2 - ls-remote --tags .git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5882
ok 3 - ls-remote .git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5883
ok 4 - ls-remote --tags self
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5884
ok 5 - ls-remote self
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5885
ok 6 - dies when no remote specified and no default remotes found
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5886
ok 7 - use "origin" when no remote specified
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5887
ok 8 - suppress "From <url>" with -q
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5888
ok 9 - use branch.<name>.remote if possible
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5889
ok 10 - confuses pattern as remote when no remote specified
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5890
ok 11 - die with non-2 for wrong repository even with --exit-code
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5891
ok 12 - Report success even when nothing matches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5892
ok 13 - Report no-match with --exit-code
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5893
ok 14 - Report match with --exit-code
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5894
# passed all 14 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5895
1..14
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5896
*** t5513-fetch-track.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5897
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5898
ok 2 - fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5899
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5900
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5901
*** t5514-fetch-multiple.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5902
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5903
ok 2 - git fetch --all
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5904
ok 3 - git fetch --all should continue if a remote has errors
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5905
ok 4 - git fetch --all does not allow non-option arguments
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5906
ok 5 - git fetch --multiple (but only one remote)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5907
ok 6 - git fetch --multiple (two remotes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5908
ok 7 - git fetch --multiple (bad remote names)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5909
ok 8 - git fetch --all (skipFetchAll)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5910
ok 9 - git fetch --multiple (ignoring skipFetchAll)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5911
# passed all 9 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5912
1..9
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5913
*** t5515-fetch-merge-logic.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5914
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5915
ok 2 - br-config-explicit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5916
ok 3 - br-config-explicit config-explicit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5917
ok 4 - br-config-explicit-merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5918
ok 5 - br-config-explicit-merge config-explicit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5919
ok 6 - br-config-explicit-octopus
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5920
ok 7 - br-config-explicit-octopus config-explicit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5921
ok 8 - br-config-glob
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5922
ok 9 - br-config-glob config-glob
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5923
ok 10 - br-config-glob-merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5924
ok 11 - br-config-glob-merge config-glob
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5925
ok 12 - br-config-glob-octopus
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5926
ok 13 - br-config-glob-octopus config-glob
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5927
ok 14 - br-remote-explicit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5928
ok 15 - br-remote-explicit remote-explicit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5929
ok 16 - br-remote-explicit-merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5930
ok 17 - br-remote-explicit-merge remote-explicit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5931
ok 18 - br-remote-explicit-octopus
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5932
ok 19 - br-remote-explicit-octopus remote-explicit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5933
ok 20 - br-remote-glob
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5934
ok 21 - br-remote-glob remote-glob
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5935
ok 22 - br-remote-glob-merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5936
ok 23 - br-remote-glob-merge remote-glob
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5937
ok 24 - br-remote-glob-octopus
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5938
ok 25 - br-remote-glob-octopus remote-glob
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5939
ok 26 - br-branches-default
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5940
ok 27 - br-branches-default branches-default
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5941
ok 28 - br-branches-default-merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5942
ok 29 - br-branches-default-merge branches-default
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5943
ok 30 - br-branches-default-octopus
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5944
ok 31 - br-branches-default-octopus branches-default
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5945
ok 32 - br-branches-one
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5946
ok 33 - br-branches-one branches-one
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5947
ok 34 - br-branches-one-merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5948
ok 35 - br-branches-one-merge branches-one
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5949
ok 36 - br-branches-one-octopus
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5950
ok 37 - br-branches-one-octopus branches-one
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5951
ok 38 - master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5952
ok 39 - master config-explicit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5953
ok 40 - master config-glob
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5954
ok 41 - master remote-explicit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5955
ok 42 - master remote-glob
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5956
ok 43 - master branches-default
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5957
ok 44 - master branches-one
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5958
ok 45 - br-unconfig
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5959
ok 46 - br-unconfig config-explicit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5960
ok 47 - br-unconfig config-glob
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5961
ok 48 - br-unconfig remote-explicit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5962
ok 49 - br-unconfig remote-glob
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5963
ok 50 - br-unconfig branches-default
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5964
ok 51 - br-unconfig branches-one
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5965
ok 52 - master ../.git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5966
ok 53 - master ../.git one
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5967
ok 54 - master ../.git one two
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5968
ok 55 - master --tags ../.git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5969
ok 56 - master ../.git tag tag-one tag tag-three
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5970
ok 57 - master ../.git tag tag-one-tree tag tag-three-file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5971
ok 58 - master ../.git one tag tag-one tag tag-three-file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5972
ok 59 - br-unconfig ../.git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5973
ok 60 - br-unconfig ../.git one
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5974
ok 61 - br-unconfig ../.git one two
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5975
ok 62 - br-unconfig --tags ../.git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5976
ok 63 - br-unconfig ../.git tag tag-one tag tag-three
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5977
ok 64 - br-unconfig ../.git tag tag-one-tree tag tag-three-file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5978
ok 65 - br-unconfig ../.git one tag tag-one tag tag-three-file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5979
# passed all 65 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5980
1..65
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5981
*** t5516-fetch-push.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5982
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5983
ok 2 - fetch without wildcard
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5984
ok 3 - fetch with wildcard
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5985
ok 4 - fetch with insteadOf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5986
ok 5 - fetch with pushInsteadOf (should not rewrite)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5987
ok 6 - push without wildcard
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5988
ok 7 - push with wildcard
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5989
ok 8 - push with insteadOf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5990
ok 9 - push with pushInsteadOf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5991
ok 10 - push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5992
ok 11 - push with matching heads
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5993
ok 12 - push with matching heads on the command line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5994
ok 13 - failed (non-fast-forward) push with matching heads
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5995
ok 14 - push --force with matching heads
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5996
ok 15 - push with matching heads and forced update
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5997
ok 16 - push with no ambiguity (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5998
ok 17 - push with no ambiguity (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  5999
ok 18 - push with colon-less refspec, no ambiguity
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6000
ok 19 - push with weak ambiguity (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6001
ok 20 - push with weak ambiguity (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6002
ok 21 - push with ambiguity
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6003
ok 22 - push with colon-less refspec (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6004
ok 23 - push with colon-less refspec (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6005
ok 24 - push with colon-less refspec (3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6006
ok 25 - push with colon-less refspec (4)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6007
ok 26 - push head with non-existent, incomplete dest
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6008
ok 27 - push tag with non-existent, incomplete dest
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6009
ok 28 - push sha1 with non-existent, incomplete dest
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6010
ok 29 - push ref expression with non-existent, incomplete dest
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6011
ok 30 - push with HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6012
ok 31 - push with HEAD nonexisting at remote
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6013
ok 32 - push with +HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6014
ok 33 - push HEAD with non-existent, incomplete dest
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6015
ok 34 - push with config remote.*.push = HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6016
ok 35 - push with config remote.*.pushurl
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6017
ok 36 - push with dry-run
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6018
ok 37 - push updates local refs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6019
ok 38 - push updates up-to-date local refs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6020
ok 39 - push preserves up-to-date packed refs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6021
ok 40 - push does not update local refs on failure
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6022
ok 41 - allow deleting an invalid remote ref
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6023
ok 42 - pushing valid refs triggers post-receive and post-update hooks
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6024
ok 43 - deleting dangling ref triggers hooks with correct args
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6025
ok 44 - deletion of a non-existent ref is not fed to post-receive and post-update hooks
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6026
ok 45 - deletion of a non-existent ref alone does trigger post-receive and post-update hooks
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6027
ok 46 - mixed ref updates, deletes, invalid deletes trigger hooks with correct input
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6028
ok 47 - allow deleting a ref using --delete
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6029
ok 48 - allow deleting a tag using --delete
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6030
ok 49 - push --delete without args aborts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6031
ok 50 - push --delete refuses src:dest refspecs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6032
ok 51 - warn on push to HEAD of non-bare repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6033
ok 52 - deny push to HEAD of non-bare repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6034
ok 53 - allow push to HEAD of bare repository (bare)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6035
ok 54 - allow push to HEAD of non-bare repository (config)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6036
ok 55 - fetch with branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6037
ok 56 - fetch with branches containing #
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6038
ok 57 - push with branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6039
ok 58 - push with branches containing #
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6040
ok 59 - push into aliased refs (consistent)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6041
ok 60 - push into aliased refs (inconsistent)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6042
ok 61 - push --porcelain
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6043
ok 62 - push --porcelain bad url
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6044
ok 63 - push --porcelain rejected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6045
ok 64 - push --porcelain --dry-run rejected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6046
# passed all 64 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6047
1..64
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6048
*** t5517-push-mirror.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6049
ok 1 - push mirror creates new branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6050
ok 2 - push mirror updates existing branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6051
ok 3 - push mirror force updates existing branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6052
ok 4 - push mirror removes branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6053
ok 5 - push mirror adds, updates and removes branches together
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6054
ok 6 - push mirror creates new tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6055
ok 7 - push mirror updates existing tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6056
ok 8 - push mirror force updates existing tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6057
ok 9 - push mirror removes tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6058
ok 10 - push mirror adds, updates and removes tags together
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6059
ok 11 - remote.foo.mirror adds and removes branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6060
ok 12 - remote.foo.mirror=no has no effect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6061
# passed all 12 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6062
1..12
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6063
*** t5518-fetch-exit-status.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6064
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6065
ok 2 - non-fast-forward fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6066
ok 3 - forced update
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6067
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6068
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6069
*** t5519-push-alternates.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6070
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6071
ok 2 - alice works and pushes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6072
ok 3 - bob fetches from alice, works and pushes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6073
ok 4 - clean-up in case the previous failed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6074
ok 5 - alice works and pushes again
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6075
ok 6 - bob works and pushes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6076
ok 7 - alice works and pushes yet again
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6077
ok 8 - bob works and pushes again
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6078
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6079
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6080
*** t5520-pull.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6081
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6082
ok 2 - pulling into void
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6083
ok 3 - checking the results
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6084
ok 4 - pulling into void using master:master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6085
ok 5 - pulling into void does not overwrite untracked files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6086
ok 6 - test . as a remote
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6087
ok 7 - the default remote . should not break explicit pull
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6088
ok 8 - --rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6089
ok 9 - pull.rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6090
ok 10 - branch.to-rebase.rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6091
ok 11 - branch.to-rebase.rebase should override pull.rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6092
ok 12 - --rebase with rebased upstream
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6093
ok 13 - --rebase with rebased default upstream
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6094
ok 14 - rebased upstream + fetch + pull --rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6095
ok 15 - pull --rebase dies early with dirty working directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6096
ok 16 - pull --rebase works on branch yet to be born
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6097
ok 17 - setup for detecting upstreamed changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6098
ok 18 - git pull --rebase detects upstreamed changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6099
ok 19 - setup for avoiding reapplying old patches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6100
ok 20 - git pull --rebase does not reapply old patches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6101
ok 21 - git pull --rebase against local branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6102
# passed all 21 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6103
1..21
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6104
*** t5521-pull-options.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6105
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6106
ok 2 - git pull -q
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6107
ok 3 - git pull
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6108
ok 4 - git pull -v
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6109
ok 5 - git pull -v -q
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6110
ok 6 - git pull -q -v
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6111
ok 7 - git pull --force
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6112
ok 8 - git pull --all
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6113
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6114
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6115
*** t5522-pull-symlink.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6116
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6117
ok 2 - pulling from real subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6118
ok 3 - pulling from symlinked subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6119
ok 4 - pushing from symlinked subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6120
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6121
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6122
*** t5523-push-upstream.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6123
ok 1 - set up terminal for tests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6124
ok 2 - setup bare parent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6125
ok 3 - setup local commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6126
ok 4 - push -u master:master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6127
ok 5 - push -u master:other
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6128
ok 6 - push -u --dry-run master:otherX
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6129
ok 7 - push -u master2:master2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6130
ok 8 - push -u master2:other2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6131
ok 9 - push -u :master2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6132
ok 10 - push -u --all
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6133
ok 11 - push -u HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6134
ok 12 # skip progress messages go to tty (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6135
ok 13 - progress messages do not go to non-tty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6136
ok 14 - progress messages go to non-tty (forced)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6137
ok 15 # skip push -q suppresses progress (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6138
ok 16 # skip push --no-progress suppresses progress (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6139
ok 17 # skip quiet push (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6140
# passed all 17 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6141
1..17
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6142
*** t5524-pull-msg.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6143
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6144
ok 2 - pull
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6145
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6146
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6147
*** t5525-fetch-tagopt.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6148
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6149
ok 2 - fetch with tagopt=--no-tags does not get tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6150
ok 3 - fetch --tags with tagopt=--no-tags gets tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6151
ok 4 - fetch --no-tags with tagopt=--tags does not get tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6152
ok 5 - fetch with tagopt=--tags gets tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6153
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6154
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6155
*** t5526-fetch-submodules.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6156
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6157
ok 2 - fetch --recurse-submodules recurses into submodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6158
ok 3 - fetch alone only fetches superproject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6159
ok 4 - fetch --no-recurse-submodules only fetches superproject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6160
ok 5 - using fetchRecurseSubmodules=true in .gitmodules recurses into submodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6161
ok 6 - --no-recurse-submodules overrides .gitmodules config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6162
ok 7 - using fetchRecurseSubmodules=false in .git/config overrides setting in .gitmodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6163
ok 8 - --recurse-submodules overrides fetchRecurseSubmodules setting from .git/config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6164
ok 9 - --quiet propagates to submodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6165
ok 10 - --dry-run propagates to submodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6166
ok 11 - Without --dry-run propagates to submodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6167
ok 12 - recurseSubmodules=true propagates into submodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6168
ok 13 - --recurse-submodules overrides config in submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6169
ok 14 - --no-recurse-submodules overrides config setting
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6170
ok 15 - Recursion doesn't happen when no new commits are fetched in the superproject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6171
ok 16 - Recursion stops when no new submodule commits are fetched
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6172
ok 17 - Recursion doesn't happen when new superproject commits don't change any submodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6173
ok 18 - Recursion picks up config in submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6174
ok 19 - Recursion picks up all submodules when necessary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6175
ok 20 - '--recurse-submodules=on-demand' doesn't recurse when no new commits are fetched in the superproject (and ignores config)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6176
ok 21 - '--recurse-submodules=on-demand' recurses as deep as necessary (and ignores config)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6177
ok 22 - '--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6178
ok 23 - 'fetch.recurseSubmodules=on-demand' overrides global config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6179
ok 24 - 'submodule.<sub>.fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6180
ok 25 - don't fetch submodule when newly recorded commits are already present
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6181
# passed all 25 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6182
1..25
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6183
*** t5527-fetch-odd-refs.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6184
ok 1 - setup repo with odd suffix ref
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6185
ok 2 - suffix ref is ignored during fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6186
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6187
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6188
*** t5530-upload-pack-error.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6189
ok 1 - setup and corrupt repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6190
ok 2 - fsck fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6191
ok 3 - upload-pack fails due to error in pack-objects packing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6192
ok 4 - corrupt repo differently
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6193
ok 5 - fsck fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6194
ok 6 - upload-pack fails due to error in rev-list
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6195
ok 7 - upload-pack error message when bad ref requested
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6196
ok 8 - upload-pack fails due to error in pack-objects enumeration
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6197
ok 9 - create empty repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6198
ok 10 - fetch fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6199
# passed all 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6200
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6201
*** t5531-deep-submodule-push.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6202
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6203
ok 2 - push
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6204
ok 3 - push if submodule has no remote
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6205
ok 4 - push fails if submodule commit not on remote
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6206
ok 5 - push succeeds after commit was pushed to remote
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6207
ok 6 - push fails when commit on multiple branches if one branch has no remote
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6208
ok 7 - push succeeds if submodule has no remote and is on the first superproject commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6209
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6210
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6211
*** t5532-fetch-proxy.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6212
ok 1 - setup remote repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6213
ok 2 - setup local repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6214
ok 3 - fetch through proxy works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6215
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6216
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6217
*** t5540-http-push.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6218
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6219
1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6220
*** t5541-http-push.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6221
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6222
1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6223
*** t5550-http-fetch.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6224
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6225
1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6226
*** t5551-http-fetch.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6227
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6228
1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6229
*** t5560-http-backend-noserver.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6230
ok 1 - setup repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6231
ok 2 - direct refs/heads/master not found
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6232
ok 3 - static file is ok
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6233
ok 4 - no export by default
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6234
ok 5 - export if git-daemon-export-ok
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6235
ok 6 - static file if http.getanyfile true is ok
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6236
ok 7 - static file if http.getanyfile false fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6237
ok 8 - http.uploadpack default enabled
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6238
ok 9 - http.uploadpack true
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6239
ok 10 - http.uploadpack false
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6240
ok 11 - http.receivepack default disabled
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6241
ok 12 - http.receivepack true
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6242
ok 13 - http.receivepack false
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6243
ok 14 - http-backend blocks bad PATH_INFO
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6244
# passed all 14 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6245
1..14
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6246
*** t5561-http-backend.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6247
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6248
1..0 # SKIP Network testing disabled (define GIT_TEST_HTTPD to enable)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6249
*** t5600-clone-fail-cleanup.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6250
ok 1 - clone of non-existent source should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6251
ok 2 - failed clone should not leave a directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6252
ok 3 - clone of non-existent (relative to $PWD) source should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6253
ok 4 - clone should work now that source exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6254
ok 5 - successful clone must leave the directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6255
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6256
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6257
*** t5601-clone.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6258
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6259
ok 2 - clone with excess parameters (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6260
ok 3 - clone with excess parameters (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6261
ok 4 - output from clone
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6262
ok 5 - clone does not keep pack
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6263
ok 6 - clone checks out files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6264
ok 7 - clone respects GIT_WORK_TREE
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6265
ok 8 - clone creates intermediate directories
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6266
ok 9 - clone creates intermediate directories for bare repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6267
ok 10 - clone --mirror
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6268
ok 11 - clone --bare names the local repository <name>.git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6269
ok 12 - clone --mirror does not repeat tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6270
ok 13 - clone to destination with trailing /
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6271
ok 14 - clone to destination with extra trailing /
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6272
ok 15 - clone to an existing empty directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6273
ok 16 - clone to an existing non-empty directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6274
ok 17 - clone to an existing path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6275
ok 18 - clone a void
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6276
ok 19 - clone respects global branch.autosetuprebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6277
ok 20 - respect url-encoding of file://
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6278
ok 21 - do not query-string-decode + in URLs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6279
ok 22 - do not respect url-encoding of non-url path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6280
ok 23 - clone separate gitdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6281
ok 24 - clone separate gitdir: output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6282
ok 25 - clone from .git file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6283
ok 26 - fetch from .git gitfile
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6284
ok 27 - fetch from gitfile parent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6285
ok 28 - clone separate gitdir where target already exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6286
ok 29 - clone --reference from original
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6287
ok 30 - clone with more than one --reference
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6288
ok 31 - clone from original with relative alternate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6289
# passed all 31 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6290
1..31
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6291
*** t5602-clone-remote-exec.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6292
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6293
ok 2 - clone calls git upload-pack unqualified with no -u option
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6294
ok 3 - clone calls specified git upload-pack with -u option
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6295
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6296
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6297
*** t5700-clone-reference.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6298
ok 1 - preparing first repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6299
ok 2 - preparing second repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6300
ok 3 - cloning with reference (-l -s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6301
ok 4 - existence of info/alternates
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6302
ok 5 - pulling from reference
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6303
ok 6 - that reference gets used
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6304
ok 7 - cloning with reference (no -l -s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6305
ok 8 - fetched no objects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6306
ok 9 - existence of info/alternates
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6307
ok 10 - pulling from reference
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6308
ok 11 - that reference gets used
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6309
ok 12 - updating origin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6310
ok 13 - pulling changes from origin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6311
ok 14 - that alternate to origin gets used
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6312
ok 15 - pulling changes from origin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6313
ok 16 - check objects expected to exist locally
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6314
ok 17 - preparing alternate repository #1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6315
ok 18 - cloning alternate repo #2 and adding changes to repo #1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6316
ok 19 - cloning alternate repo #1, using #2 as reference
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6317
ok 20 - cloning with reference being subset of source (-l -s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6318
ok 21 - clone with reference from a tagged repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6319
# passed all 21 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6320
1..21
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6321
*** t5701-clone-local.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6322
ok 1 - preparing origin repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6323
ok 2 - local clone without .git suffix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6324
ok 3 - local clone with .git suffix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6325
ok 4 - local clone from x
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6326
ok 5 - local clone from x.git that does not exist
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6327
ok 6 - With -no-hardlinks, local will make a copy
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6328
ok 7 - Even without -l, local will make a hardlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6329
ok 8 - local clone of repo with nonexistent ref in HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6330
ok 9 - bundle clone without .bundle suffix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6331
ok 10 - bundle clone with .bundle suffix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6332
ok 11 - bundle clone from b4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6333
ok 12 - bundle clone from b4.bundle that does not exist
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6334
ok 13 - bundle clone with nonexistent HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6335
ok 14 - clone empty repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6336
ok 15 - clone empty repository, and then push should not segfault.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6337
ok 16 - cloning non-existent directory fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6338
ok 17 - cloning non-git directory fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6339
# passed all 17 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6340
1..17
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6341
*** t5702-clone-options.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6342
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6343
ok 2 - clone -o
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6344
ok 3 - redirected clone
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6345
ok 4 - redirected clone -v
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6346
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6347
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6348
*** t5704-bundle.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6349
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6350
ok 2 - tags can be excluded by rev-list options
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6351
ok 3 - die if bundle file cannot be created
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6352
not ok 4 - bundle --stdin # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6353
not ok 5 - bundle --stdin <rev-list options> # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6354
ok 6 - empty bundle file is rejected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6355
# still have 2 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6356
# passed all remaining 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6357
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6358
*** t5705-clone-2gb.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6359
Skipping expensive 2GB clone test; enable it with GIT_TEST_CLONE_2GB=t
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6360
ok 1 # skip setup (missing CLONE_2GB)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6361
ok 2 # skip clone - bare (missing CLONE_2GB)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6362
ok 3 # skip clone - with worktree, file:// protocol (missing CLONE_2GB)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6363
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6364
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6365
*** t5706-clone-branch.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6366
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6367
ok 2 - vanilla clone chooses HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6368
ok 3 - clone -b chooses specified branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6369
ok 4 - clone -b sets up tracking
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6370
ok 5 - clone -b does not munge remotes/origin/HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6371
ok 6 - clone -b with bogus branch chooses HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6372
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6373
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6374
*** t5707-clone-detached.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6375
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6376
ok 2 - clone repo (detached HEAD points to branch)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6377
ok 3 - cloned HEAD matches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6378
not ok 4 - cloned HEAD is detached # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6379
ok 5 - clone repo (detached HEAD points to tag)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6380
ok 6 - cloned HEAD matches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6381
ok 7 - cloned HEAD is detached
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6382
ok 8 - clone repo (detached HEAD points to history)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6383
ok 9 - cloned HEAD matches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6384
ok 10 - cloned HEAD is detached
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6385
ok 11 - clone repo (orphan detached HEAD)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6386
ok 12 - cloned HEAD matches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6387
ok 13 - cloned HEAD is detached
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6388
# still have 1 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6389
# passed all remaining 12 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6390
1..13
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6391
*** t5708-clone-config.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6392
ok 1 - clone -c sets config in cloned repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6393
ok 2 - clone -c can set multi-keys
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6394
ok 3 - clone -c without a value is boolean true
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6395
ok 4 - clone -c config is available during clone
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6396
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6397
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6398
*** t5710-info-alternate.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6399
ok 1 - preparing first repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6400
ok 2 - preparing second repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6401
ok 3 - preparing third repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6402
ok 4 - creating too deep nesting
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6403
ok 5 - invalidity of deepest repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6404
ok 6 - validity of third repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6405
ok 7 - validity of fourth repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6406
ok 8 - breaking of loops
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6407
ok 9 - that info/alternates is necessary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6408
ok 10 - that relative alternate is possible for current dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6409
ok 11 - that relative alternate is only possible for current dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6410
# passed all 11 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6411
1..11
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6412
*** t5800-remote-helpers.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6413
ok 1 - setup repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6414
ok 2 - cloning from local repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6415
ok 3 - cloning from remote repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6416
ok 4 - create new commit on remote
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6417
ok 5 - pulling from local repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6418
ok 6 - pulling from remote remote
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6419
ok 7 - pushing to local repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6420
ok 8 - synch with changes from localclone
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6421
ok 9 - pushing remote local repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6422
ok 10 - fetch new branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6423
ok 11 - fetch multiple branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6424
ok 12 - push when remote has extra refs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6425
ok 13 - push new branch by name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6426
not ok 14 - push new branch with old:new refspec # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6427
# still have 1 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6428
# passed all remaining 13 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6429
1..14
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6430
*** t5900-repo-selection.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6431
ok 1 - find .git dir in worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6432
ok 2 - automagically add .git suffix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6433
ok 3 - automagically add .git suffix to worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6434
ok 4 - prefer worktree foo over bare foo.git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6435
ok 5 - prefer bare foo over bare foo.git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6436
ok 6 - disambiguate with full foo.git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6437
ok 7 - we are not fooled by non-git foo directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6438
ok 8 - prefer inner .git over outer bare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6439
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6440
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6441
*** t6000-rev-list-misc.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6442
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6443
ok 2 - rev-list --objects heeds pathspecs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6444
ok 3 - rev-list --objects with pathspecs and deeper paths
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6445
ok 4 - rev-list --objects with pathspecs and copied files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6446
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6447
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6448
*** t6001-rev-list-graft.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6449
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6450
ok 2 - without grafts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6451
ok 3 - with grafts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6452
ok 4 - without grafts, with pathlimit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6453
ok 5 - with grafts, with pathlimit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6454
ok 6 - without grafts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6455
ok 7 - with grafts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6456
ok 8 - without grafts, with pathlimit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6457
ok 9 - with grafts, with pathlimit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6458
ok 10 - without grafts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6459
ok 11 - with grafts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6460
ok 12 - without grafts, with pathlimit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6461
ok 13 - with grafts, with pathlimit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6462
# passed all 13 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6463
1..13
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6464
*** t6002-rev-list-bisect.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6465
ok 1 - bisection diff --bisect l0 ^root <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6466
ok 2 - bisection diff --bisect l1 ^root <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6467
ok 3 - bisection diff --bisect l2 ^root <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6468
ok 4 - bisection diff --bisect a0 ^root <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6469
ok 5 - bisection diff --bisect a1 ^root <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6470
ok 6 - bisection diff --bisect a2 ^root <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6471
ok 7 - bisection diff --bisect a3 ^root <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6472
ok 8 - bisection diff --bisect b1 ^root <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6473
ok 9 - bisection diff --bisect b2 ^root <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6474
ok 10 - bisection diff --bisect b3 ^root <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6475
ok 11 - bisection diff --bisect c1 ^root <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6476
ok 12 - bisection diff --bisect c2 ^root <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6477
ok 13 - bisection diff --bisect c3 ^root <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6478
ok 14 - bisection diff --bisect E ^F <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6479
ok 15 - bisection diff --bisect e1 ^F <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6480
ok 16 - bisection diff --bisect e2 ^F <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6481
ok 17 - bisection diff --bisect e3 ^F <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6482
ok 18 - bisection diff --bisect e4 ^F <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6483
ok 19 - bisection diff --bisect e5 ^F <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6484
ok 20 - bisection diff --bisect e6 ^F <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6485
ok 21 - bisection diff --bisect e7 ^F <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6486
ok 22 - bisection diff --bisect f1 ^F <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6487
ok 23 - bisection diff --bisect f2 ^F <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6488
ok 24 - bisection diff --bisect f3 ^F <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6489
ok 25 - bisection diff --bisect f4 ^F <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6490
ok 26 - bisection diff --bisect E ^F <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6491
ok 27 - bisection diff --bisect V ^U <= 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6492
ok 28 - bisection diff --bisect V ^U ^u1 ^u2 ^u3 <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6493
ok 29 - bisection diff --bisect u1 ^U <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6494
ok 30 - bisection diff --bisect u2 ^U <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6495
ok 31 - bisection diff --bisect u3 ^U <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6496
ok 32 - bisection diff --bisect u4 ^U <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6497
ok 33 - bisection diff --bisect u5 ^U <= 0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6498
ok 34 - --bisect l5 ^root
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6499
ok 35 - --bisect l5 ^root ^c3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6500
ok 36 - --bisect l5 ^root ^c3 ^b4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6501
ok 37 - --bisect l3 ^root ^c3 ^b4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6502
ok 38 - --bisect l5 ^b3 ^a3 ^b4 ^a4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6503
ok 39 - --bisect l4 ^a2 ^a3 ^b ^a4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6504
ok 40 - --bisect l3 ^a2 ^a3 ^b ^a4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6505
ok 41 - --bisect a4 ^a2 ^a3 ^b4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6506
ok 42 - --bisect a4 ^a2 ^a3 ^b4 ^c2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6507
ok 43 - --bisect a4 ^a2 ^a3 ^b4 ^c2 ^c3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6508
ok 44 - --bisect a4 ^a2 ^a3 ^b4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6509
ok 45 - --bisect c3 ^a2 ^a3 ^b4 ^c2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6510
# passed all 45 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6511
1..45
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6512
*** t6003-rev-list-topo-order.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6513
ok 1 - rev-list has correct number of entries
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6514
ok 2 - simple topo order
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6515
ok 3 - two diamonds topo order (g6)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6516
ok 4 - multiple heads
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6517
ok 5 - multiple heads, prune at a1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6518
ok 6 - multiple heads, prune at l1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6519
ok 7 - cross-epoch, head at l5, prune at l1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6520
ok 8 - duplicated head arguments
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6521
ok 9 - prune near topo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6522
ok 10 - head has no parent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6523
ok 11 - two nodes - one head, one base
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6524
ok 12 - three nodes one head, one internal, one base
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6525
ok 13 - linear prune l2 ^root
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6526
ok 14 - linear prune l2 ^l0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6527
ok 15 - linear prune l2 ^l1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6528
ok 16 - linear prune l5 ^a4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6529
ok 17 - linear prune l5 ^l3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6530
ok 18 - linear prune l5 ^l4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6531
ok 19 - max-count 10 - topo order
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6532
ok 20 - max-count 10 - non topo order
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6533
ok 21 - --max-age=c3, no --topo-order
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6534
ok 22 - one specified head reachable from another a4, c3, --topo-order
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6535
ok 23 - one specified head reachable from another c3, a4, --topo-order
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6536
ok 24 - one specified head reachable from another a4, c3, no --topo-order
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6537
ok 25 - one specified head reachable from another c3, a4, no --topo-order
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6538
ok 26 - graph with c3 and a4 parents of head
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6539
ok 27 - graph with a4 and c3 parents of head
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6540
ok 28 - head ^head --topo-order
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6541
ok 29 - head ^head no --topo-order
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6542
ok 30 - simple topo order (l5r1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6543
ok 31 - simple topo order (r1l5)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6544
ok 32 - don't print things unreachable from one branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6545
ok 33 - --topo-order a4 l3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6546
# passed all 33 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6547
1..33
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6548
*** t6004-rev-list-path-optim.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6549
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6550
ok 2 - path-optimization
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6551
ok 3 - further setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6552
ok 4 - path optimization 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6553
ok 5 - pathspec with leading path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6554
ok 6 - pathspec with glob (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6555
ok 7 - pathspec with glob (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6556
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6557
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6558
*** t6005-rev-list-count.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6559
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6560
ok 2 - no options
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6561
ok 3 - --max-count
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6562
ok 4 - --max-count all forms
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6563
ok 5 - --skip
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6564
ok 6 - --skip --max-count
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6565
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6566
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6567
*** t6006-rev-list-format.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6568
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6569
ok 2 - format percent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6570
ok 3 - format hash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6571
ok 4 - format tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6572
ok 5 - format parents
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6573
ok 6 - format author
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6574
ok 7 - format committer
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6575
ok 8 - format encoding
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6576
ok 9 - format subject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6577
ok 10 - format body
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6578
ok 11 - format raw-body
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6579
ok 12 - format colors
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6580
ok 13 - format advanced-colors
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6581
ok 14 - setup complex body
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6582
ok 15 - format complex-encoding
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6583
ok 16 - format complex-subject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6584
ok 17 - format complex-body
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6585
ok 18 - %x00 shows NUL
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6586
ok 19 - %ad respects --date=
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6587
ok 20 - empty email
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6588
ok 21 - del LF before empty (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6589
ok 22 - del LF before empty (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6590
ok 23 - add LF before non-empty (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6591
ok 24 - add LF before non-empty (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6592
ok 25 - add SP before non-empty (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6593
ok 26 - add SP before non-empty (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6594
ok 27 - --abbrev
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6595
ok 28 - %H is not affected by --abbrev-commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6596
ok 29 - %h is not affected by --abbrev-commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6597
ok 30 - "%h %gD: %gs" is same as git-reflog
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6598
ok 31 - "%h %gD: %gs" is same as git-reflog (with date)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6599
ok 32 - "%h %gD: %gs" is same as git-reflog (with --abbrev)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6600
ok 33 - %gd shortens ref name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6601
ok 34 - reflog identity
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6602
ok 35 - oneline with empty message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6603
# passed all 35 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6604
1..35
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6605
*** t6007-rev-list-cherry-pick-file.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6606
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6607
ok 2 - --left-right
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6608
ok 3 - --count
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6609
ok 4 - --cherry-pick foo comes up empty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6610
ok 5 - --cherry-pick bar does not come up empty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6611
ok 6 - bar does not come up empty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6612
ok 7 - --cherry-pick bar does not come up empty (II)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6613
ok 8 - --cherry-mark
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6614
ok 9 - --cherry-mark --left-right
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6615
ok 10 - --cherry-pick --right-only
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6616
ok 11 - --cherry-pick --left-only
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6617
ok 12 - --cherry
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6618
ok 13 - --cherry --count
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6619
ok 14 - --cherry-mark --count
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6620
ok 15 - --cherry-mark --left-right --count
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6621
ok 16 - --cherry-pick with independent, but identical branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6622
ok 17 - --count --left-right
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6623
# passed all 17 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6624
1..17
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6625
*** t6008-rev-list-submodule.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6626
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6627
ok 2 - Ilari's test
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6628
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6629
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6630
*** t6009-rev-list-parent.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6631
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6632
ok 2 - one is ancestor of others and should not be shown
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6633
ok 3 - setup roots, merges and octopuses
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6634
ok 4 - rev-list roots
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6635
ok 5 - rev-list no merges
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6636
ok 6 - rev-list no octopuses
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6637
ok 7 - rev-list no roots
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6638
ok 8 - rev-list merges
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6639
ok 9 - rev-list octopus
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6640
ok 10 - rev-list ordinary commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6641
ok 11 - rev-list --merges --no-merges yields empty set
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6642
ok 12 - rev-list override and infinities
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6643
ok 13 - dodecapus
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6644
# passed all 13 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6645
1..13
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6646
*** t6010-merge-base.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6647
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6648
ok 2 - set up G and H
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6649
ok 3 - merge-base G H
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6650
ok 4 - merge-base/show-branch --independent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6651
ok 5 - unsynchronized clocks
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6652
ok 6 - --independent with unsynchronized clocks
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6653
ok 7 - merge-base for octopus-step (setup)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6654
ok 8 - merge-base A B C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6655
ok 9 - criss-cross merge-base for octopus-step
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6656
# passed all 9 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6657
1..9
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6658
*** t6011-rev-list-with-bad-commit.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6659
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6660
ok 2 - verify number of revisions
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6661
ok 3 - corrupt second commit object
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6662
ok 4 - rev-list should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6663
ok 5 - git repack _MUST_ fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6664
ok 6 - first commit is still available
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6665
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6666
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6667
*** t6012-rev-list-simplify.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6668
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6669
ok 2 - log --full-history
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6670
ok 3 - log --full-history -- file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6671
ok 4 - log --full-history --topo-order -- file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6672
ok 5 - log --full-history --date-order -- file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6673
ok 6 - log --simplify-merges -- file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6674
ok 7 - log -- file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6675
ok 8 - log --topo-order -- file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6676
ok 9 - log --first-parent -- another-file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6677
# passed all 9 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6678
1..9
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6679
*** t6013-rev-list-reverse-parents.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6680
ok 1 - set up --reverse example
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6681
ok 2 - --reverse --parents --full-history combines correctly
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6682
ok 3 - --boundary does too
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6683
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6684
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6685
*** t6014-rev-list-all.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6686
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6687
ok 2 - rev-list --all lists detached HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6688
ok 3 - repack does not lose detached HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6689
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6690
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6691
*** t6015-rev-list-show-all-parents.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6692
ok 1 - set up --show-all --parents test
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6693
ok 2 - --parents rewrites TREESAME parents correctly
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6694
ok 3 - --parents --show-all does not rewrites TREESAME parents
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6695
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6696
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6697
*** t6016-rev-list-graph-simplify-history.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6698
ok 1 - set up rev-list --graph test
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6699
ok 2 - --graph --all
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6700
ok 3 - --graph --simplify-by-decoration
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6701
ok 4 - setup: get rid of decorations on B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6702
ok 5 - --graph --simplify-by-decoration prune branch B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6703
ok 6 - --graph --full-history -- bar.txt
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6704
ok 7 - --graph --full-history --simplify-merges -- bar.txt
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6705
ok 8 - --graph -- bar.txt
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6706
ok 9 - --graph --sparse -- bar.txt
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6707
ok 10 - --graph ^C4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6708
ok 11 - --graph ^C3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6709
ok 12 - --graph --boundary ^C3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6710
# passed all 12 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6711
1..12
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6712
*** t6017-rev-list-stdin.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6713
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6714
ok 2 - check rev-list master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6715
ok 3 - check log --stat master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6716
ok 4 - check rev-list side-1 ^side-4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6717
ok 5 - check log --stat side-1 ^side-4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6718
ok 6 - check rev-list side-1 ^side-7 --
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6719
ok 7 - check log --stat side-1 ^side-7 --
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6720
ok 8 - check rev-list side-1 ^side-7 -- file-1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6721
ok 9 - check log --stat side-1 ^side-7 -- file-1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6722
ok 10 - check rev-list side-1 ^side-7 -- file-2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6723
ok 11 - check log --stat side-1 ^side-7 -- file-2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6724
ok 12 - check rev-list side-3 ^side-4 -- file-3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6725
ok 13 - check log --stat side-3 ^side-4 -- file-3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6726
ok 14 - check rev-list side-3 ^side-2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6727
ok 15 - check log --stat side-3 ^side-2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6728
ok 16 - check rev-list side-3 ^side-2 -- file-1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6729
ok 17 - check log --stat side-3 ^side-2 -- file-1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6730
ok 18 - not only --stdin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6731
# passed all 18 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6732
1..18
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6733
*** t6018-rev-list-glob.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6734
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6735
ok 2 - rev-parse --glob=refs/heads/subspace/*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6736
ok 3 - rev-parse --glob=heads/subspace/*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6737
ok 4 - rev-parse --glob=refs/heads/subspace/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6738
ok 5 - rev-parse --glob=heads/subspace/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6739
ok 6 - rev-parse --glob=heads/subspace
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6740
not ok 7 - rev-parse accepts --glob as detached option # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6741
not ok 8 - rev-parse is not confused by option-like glob # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6742
ok 9 - rev-parse --branches=subspace/*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6743
ok 10 - rev-parse --branches=subspace/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6744
ok 11 - rev-parse --branches=subspace
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6745
ok 12 - rev-parse --glob=heads/subspace/* --glob=heads/other/*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6746
ok 13 - rev-parse --glob=heads/someref/* master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6747
ok 14 - rev-parse --glob=heads/*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6748
ok 15 - rev-parse --tags=foo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6749
ok 16 - rev-parse --remotes=foo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6750
ok 17 - rev-list --glob=refs/heads/subspace/*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6751
ok 18 - rev-list --glob refs/heads/subspace/*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6752
ok 19 - rev-list not confused by option-like --glob arg
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6753
ok 20 - rev-list --glob=heads/subspace/*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6754
ok 21 - rev-list --glob=refs/heads/subspace/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6755
ok 22 - rev-list --glob=heads/subspace/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6756
ok 23 - rev-list --glob=heads/subspace
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6757
ok 24 - rev-list --branches=subspace/*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6758
ok 25 - rev-list --branches=subspace/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6759
ok 26 - rev-list --branches=subspace
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6760
ok 27 - rev-list --branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6761
ok 28 - rev-list --glob=heads/someref/* master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6762
ok 29 - rev-list --glob=heads/subspace/* --glob=heads/other/*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6763
ok 30 - rev-list --glob=heads/*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6764
ok 31 - rev-list --tags=foo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6765
ok 32 - rev-list --tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6766
ok 33 - rev-list --remotes=foo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6767
ok 34 - shortlog accepts --glob/--tags/--remotes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6768
not ok 35 - shortlog accepts --glob as detached option # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6769
not ok 36 - shortlog --glob is not confused by option-like argument # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6770
# still have 4 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6771
# passed all remaining 32 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6772
1..36
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6773
*** t6019-rev-list-ancestry-path.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6774
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6775
ok 2 - rev-list D..M
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6776
ok 3 - rev-list --ancestry-path D..M
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6777
ok 4 - rev-list D..M -- M.t
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6778
ok 5 - rev-list --ancestry-patch D..M -- M.t
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6779
ok 6 - setup criss-cross
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6780
ok 7 - criss-cross: rev-list --ancestry-path cb..bc
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6781
ok 8 - criss-cross: rev-list --ancestry-path --all ^cb
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6782
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6783
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6784
*** t6020-merge-df.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6785
ok 1 - prepare repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6786
ok 2 - Merge with d/f conflicts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6787
ok 3 - F/D conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6788
ok 4 - setup modify/delete + directory/file conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6789
ok 5 - modify/delete + directory/file conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6790
ok 6 - modify/delete + directory/file conflict; other way
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6791
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6792
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6793
*** t6021-merge-criss-cross.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6794
ok 1 - prepare repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6795
ok 2 - Criss-cross merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6796
ok 3 - Criss-cross merge result
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6797
ok 4 - Criss-cross merge fails (-s resolve)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6798
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6799
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6800
*** t6022-merge-rename.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6801
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6802
ok 2 - pull renaming branch into unrenaming one
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6803
ok 3 - pull renaming branch into another renaming one
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6804
ok 4 - pull unrenaming branch into renaming one
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6805
ok 5 - pull conflicting renames
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6806
ok 6 - interference with untracked working tree file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6807
ok 7 - interference with untracked working tree file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6808
ok 8 - interference with untracked working tree file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6809
ok 9 - updated working tree file should prevent the merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6810
ok 10 - updated working tree file should prevent the merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6811
ok 11 - interference with untracked working tree file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6812
ok 12 - merge of identical changes in a renamed file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6813
ok 13 - setup for rename + d/f conflicts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6814
ok 14 - Rename+D/F conflict; renamed file merges + dir not in way
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6815
ok 15 - Rename+D/F conflict; renamed file merges but dir in way
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6816
ok 16 - Same as previous, but merged other way
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6817
ok 17 - Rename+D/F conflict; renamed file cannot merge, dir not in way
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6818
ok 18 - Rename+D/F conflict; renamed file cannot merge and dir in the way
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6819
ok 19 - Same as previous, but merged other way
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6820
ok 20 - setup both rename source and destination involved in D/F conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6821
ok 21 - both rename source and destination involved in D/F conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6822
ok 22 - setup pair rename to parent of other (D/F conflicts)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6823
ok 23 - pair rename to parent of other (D/F conflicts) w/ untracked dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6824
ok 24 - pair rename to parent of other (D/F conflicts) w/ clean start
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6825
ok 25 - setup rename of one file to two, with directories in the way
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6826
ok 26 - check handling of differently renamed file with D/F conflicts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6827
ok 27 - setup rename one file to two; directories moving out of the way
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6828
ok 28 - check handling of differently renamed file with D/F conflicts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6829
ok 29 - setup avoid unnecessary update, normal rename
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6830
ok 30 - avoid unnecessary update, normal rename
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6831
ok 31 - setup to test avoiding unnecessary update, with D/F conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6832
ok 32 - avoid unnecessary update, with D/F conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6833
ok 33 - setup avoid unnecessary update, dir->(file,nothing)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6834
ok 34 - avoid unnecessary update, dir->(file,nothing)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6835
ok 35 - setup avoid unnecessary update, modify/delete
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6836
ok 36 - avoid unnecessary update, modify/delete
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6837
ok 37 - setup avoid unnecessary update, rename/add-dest
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6838
ok 38 - avoid unnecessary update, rename/add-dest
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6839
ok 39 - setup merge of rename + small change
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6840
ok 40 - merge rename + small change
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6841
ok 41 - setup for use of extended merge markers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6842
ok 42 - merge master into rename has correct extended markers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6843
ok 43 - merge rename into master has correct extended markers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6844
ok 44 - setup spurious "refusing to lose untracked" message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6845
ok 45 - no spurious "refusing to lose untracked" message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6846
# passed all 45 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6847
1..45
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6848
*** t6023-merge-file.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6849
ok 1 - merge with no changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6850
ok 2 - merge without conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6851
ok 3 - works in subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6852
ok 4 - merge without conflict (--quiet)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6853
ok 5 - merge without conflict (missing LF at EOF)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6854
ok 6 - merge result added missing LF
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6855
ok 7 - merge with conflicts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6856
ok 8 - expected conflict markers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6857
ok 9 - merge with conflicts, using -L
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6858
ok 10 - expected conflict markers, with -L
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6859
ok 11 - conflict in removed tail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6860
ok 12 - expected conflict markers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6861
ok 13 - binary files cannot be merged
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6862
ok 14 - MERGE_ZEALOUS simplifies non-conflicts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6863
ok 15 - ZEALOUS_ALNUM
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6864
ok 16 - "diff3 -m" style output (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6865
ok 17 - "diff3 -m" style output (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6866
ok 18 - marker size
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6867
# passed all 18 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6868
1..18
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6869
*** t6024-recursive-merge.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6870
ok 1 - setup tests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6871
ok 2 - combined merge conflicts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6872
ok 3 - result contains a conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6873
ok 4 - virtual trees were processed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6874
ok 5 - refuse to merge binary files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6875
ok 6 - mark rename/delete as unmerged
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6876
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6877
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6878
*** t6025-merge-symlinks.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6879
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6880
ok 2 - merge master into b-symlink, which has a different symbolic link
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6881
ok 3 - the merge result must be a file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6882
ok 4 - merge master into b-file, which has a file instead of a symbolic link
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6883
ok 5 - the merge result must be a file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6884
ok 6 - merge b-file, which has a file instead of a symbolic link, into master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6885
ok 7 - the merge result must be a file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6886
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6887
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6888
*** t6026-merge-attr.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6889
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6890
ok 2 - merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6891
ok 3 - check merge result in index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6892
ok 4 - check merge result in working tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6893
ok 5 - retry the merge with longer context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6894
ok 6 - custom merge backend
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6895
ok 7 - custom merge backend
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6896
ok 8 - up-to-date merge without common ancestor
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6897
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6898
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6899
*** t6027-merge-binary.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6900
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6901
ok 2 - resolve
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6902
ok 3 - recursive
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6903
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6904
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6905
*** t6028-merge-up-to-date.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6906
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6907
ok 2 - merge -s recursive up-to-date
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6908
ok 3 - merge -s recursive fast-forward
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6909
ok 4 - merge -s ours up-to-date
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6910
ok 5 - merge -s ours fast-forward
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6911
ok 6 - merge -s subtree up-to-date
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6912
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6913
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6914
*** t6029-merge-subtree.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6915
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6916
ok 2 - subtree available and works like recursive
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6917
ok 3 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6918
ok 4 - initial merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6919
ok 5 - merge update
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6920
ok 6 - initial ambiguous subtree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6921
ok 7 - merge using explicit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6922
ok 8 - merge2 using explicit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6923
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6924
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6925
*** t6030-bisect-porcelain.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6926
ok 1 - set up basic repo with 1 file (hello) and 4 commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6927
ok 2 - bisect starts with only one bad
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6928
ok 3 - bisect does not start with only one good
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6929
ok 4 - bisect start with one bad and good
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6930
ok 5 - bisect fails if given any junk instead of revs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6931
ok 6 - bisect reset: back in the master branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6932
ok 7 - bisect reset: back in another branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6933
ok 8 - bisect reset when not bisecting
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6934
ok 9 - bisect reset removes packed refs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6935
ok 10 - bisect reset removes bisect state after --no-checkout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6936
ok 11 - bisect start: back in good branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6937
ok 12 - bisect start: no ".git/BISECT_START" created if junk rev
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6938
ok 13 - bisect start: existing ".git/BISECT_START" not modified if junk rev
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6939
ok 14 - bisect start: no ".git/BISECT_START" if mistaken rev
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6940
ok 15 - bisect start: no ".git/BISECT_START" if checkout error
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6941
ok 16 - bisect skip: successfull result
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6942
ok 17 - bisect skip: cannot tell between 3 commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6943
ok 18 - bisect skip: cannot tell between 2 commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6944
ok 19 - bisect skip: with commit both bad and skipped
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6945
ok 20 - "git bisect run" simple case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6946
ok 21 - "git bisect run" with more complex "git bisect start"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6947
ok 22 - bisect skip: add line and then a new test
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6948
ok 23 - bisect skip and bisect replay
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6949
ok 24 - bisect run & skip: cannot tell between 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6950
ok 25 - bisect run & skip: find first bad
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6951
ok 26 - bisect skip only one range
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6952
ok 27 - bisect skip many ranges
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6953
ok 28 - bisect starting with a detached HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6954
ok 29 - bisect errors out if bad and good are mistaken
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6955
ok 30 - bisect does not create a "bisect" branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6956
ok 31 - side branch creation
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6957
ok 32 - good merge base when good and bad are siblings
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6958
ok 33 - skipped merge base when good and bad are siblings
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6959
ok 34 - bad merge base when good and bad are siblings
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6960
ok 35 - many merge bases creation
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6961
ok 36 - good merge bases when good and bad are siblings
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6962
ok 37 - optimized merge base checks
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6963
ok 38 - "parallel" side branch creation
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6964
ok 39 - restricting bisection on one dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6965
ok 40 - restricting bisection on one dir and a file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6966
ok 41 - skipping away from skipped commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6967
ok 42 - erroring out when using bad path parameters
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6968
ok 43 - test bisection on bare repo - --no-checkout specified
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6969
ok 44 - test bisection on bare repo - --no-checkout defaulted
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6970
ok 45 - broken branch creation
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6971
ok 46 - bisect fails if tree is broken on start commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6972
ok 47 - bisect fails if tree is broken on trial commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6973
ok 48 - bisect: --no-checkout - start commit bad
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6974
ok 49 - bisect: --no-checkout - trial commit bad
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6975
ok 50 - bisect: --no-checkout - target before breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6976
ok 51 - bisect: --no-checkout - target in breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6977
ok 52 - bisect: --no-checkout - target after breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6978
ok 53 - bisect: demonstrate identification of damage boundary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6979
# passed all 53 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6980
1..53
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6981
*** t6031-merge-recursive.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6982
ok 1 - mode change in one branch: keep changed version
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6983
ok 2 - verify executable bit on file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6984
ok 3 - mode change in both branches: expect conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6985
ok 4 - verify executable bit on file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6986
ok 5 - merging with triple rename across D/F conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6987
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6988
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6989
*** t6032-merge-large-rename.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6990
ok 1 - setup (initial)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6991
ok 2 - rename (5, ok)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6992
ok 3 - set diff.renamelimit to 4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6993
ok 4 - rename (4, ok)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6994
ok 5 - rename (5, fail)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6995
ok 6 - set merge.renamelimit to 5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6996
ok 7 - rename (5, ok)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6997
ok 8 - rename (6, fail)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6998
ok 9 - setup large simple rename
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  6999
ok 10 - massive simple rename does not spam added files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7000
# passed all 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7001
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7002
*** t6033-merge-crlf.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7003
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7004
ok 2 - Check "ours" is CRLF
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7005
ok 3 - Check that conflict file is CRLF
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7006
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7007
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7008
*** t6034-merge-rename-nocruft.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7009
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7010
ok 2 - merge white into red (A->B,M->N)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7011
ok 3 - merge blue into white (A->B, mod A, A untracked)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7012
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7013
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7014
*** t6035-merge-dir-to-symlink.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7015
ok 1 - create a commit where dir a/b changed to symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7016
ok 2 - checkout does not clobber untracked symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7017
ok 3 - a/b-2/c/d is kept when clobbering symlink b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7018
ok 4 - checkout should not have deleted a/b-2/c/d
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7019
ok 5 - setup for merge test
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7020
ok 6 - Handle D/F conflict, do not lose a/b-2/c/d in merge (resolve)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7021
ok 7 - Handle D/F conflict, do not lose a/b-2/c/d in merge (recursive)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7022
ok 8 - Handle F/D conflict, do not lose a/b-2/c/d in merge (resolve)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7023
ok 9 - Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7024
not ok 10 - do not lose untracked in merge (resolve) # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7025
ok 11 - do not lose untracked in merge (recursive)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7026
ok 12 - do not lose modifications in merge (resolve)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7027
ok 13 - do not lose modifications in merge (recursive)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7028
ok 14 - setup a merge where dir a/b-2 changed to symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7029
ok 15 - merge should not have D/F conflicts (resolve)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7030
ok 16 - merge should not have D/F conflicts (recursive)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7031
ok 17 - merge should not have F/D conflicts (recursive)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7032
# still have 1 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7033
# passed all remaining 16 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7034
1..17
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7035
*** t6036-recursive-corner-cases.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7036
ok 1 - setup basic criss-cross + rename with no modifications
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7037
ok 2 - merge simple rename+criss-cross with no modifications
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7038
ok 3 - setup criss-cross + rename merges with basic modification
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7039
ok 4 - merge criss-cross + rename merges with basic modification
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7040
ok 5 - setup differently handled merges of rename/add conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7041
ok 6 - git detects differently handled merges conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7042
ok 7 - setup criss-cross + modify/delete resolved differently
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7043
ok 8 - git detects conflict merging criss-cross+modify/delete
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7044
ok 9 - git detects conflict merging criss-cross+modify/delete, reverse direction
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7045
ok 10 - setup differently handled merges of content conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7046
not ok 11 - git detects conflict w/ criss-cross+contrived resolution # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7047
ok 12 - setup differently handled merges of directory/file conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7048
ok 13 - merge of D & E1 fails but has appropriate contents
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7049
ok 14 - merge of E1 & D fails but has appropriate contents
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7050
ok 15 - merge of D & E2 fails but has appropriate contents
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7051
ok 16 - merge of E2 & D fails but has appropriate contents
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7052
ok 17 - setup rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7053
ok 18 - handle rename/rename(1to2)/modify followed by what looks like rename/rename(2to1)/modify
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7054
ok 19 - setup criss-cross + rename/rename/add + modify/modify
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7055
not ok 20 - detect rename/rename/add-source for virtual merge-base # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7056
ok 21 - setup criss-cross+rename/rename/add-dest + simple modify
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7057
ok 22 - virtual merge base handles rename/rename(1to2)/add-dest
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7058
# still have 2 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7059
# passed all remaining 20 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7060
1..22
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7061
*** t6037-merge-ours-theirs.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7062
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7063
ok 2 - plain recursive - should conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7064
ok 3 - recursive favouring theirs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7065
ok 4 - recursive favouring ours
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7066
ok 5 - pull with -X
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7067
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7068
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7069
*** t6038-merge-text-auto.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7070
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7071
ok 2 - set up fuzz_conflict() helper
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7072
ok 3 - Merge after setting text=auto
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7073
ok 4 - Merge addition of text=auto
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7074
ok 5 - Detect CRLF/LF conflict after setting text=auto
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7075
ok 6 - Detect LF/CRLF conflict from addition of text=auto
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7076
not ok 7 - checkout -m after setting text=auto # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7077
not ok 8 - checkout -m addition of text=auto # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7078
not ok 9 - cherry-pick patch from after text=auto was added # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7079
ok 10 - Test delete/normalize conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7080
# still have 3 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7081
# passed all remaining 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7082
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7083
*** t6040-tracking-info.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7084
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7085
ok 2 - branch -v
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7086
ok 3 - branch -vv
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7087
ok 4 - checkout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7088
ok 5 - checkout with local tracked branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7089
ok 6 - status
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7090
ok 7 - fail to track lightweight tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7091
ok 8 - fail to track annotated tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7092
ok 9 - setup tracking with branch --set-upstream on existing branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7093
ok 10 - --set-upstream does not change branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7094
ok 11 - --set-upstream @{-1}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7095
# passed all 11 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7096
1..11
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7097
*** t6042-merge-rename-corner-cases.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7098
ok 1 - setup rename/delete + untracked file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7099
ok 2 - Does git preserve Gollum's precious artifact?
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7100
ok 3 - setup rename/modify/add-source conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7101
not ok 4 - rename/modify/add-source conflict resolvable # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7102
ok 5 - setup resolvable conflict missed if rename missed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7103
not ok 6 - conflict caused if rename not detected # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7104
ok 7 - setup conflict resolved wrong if rename missed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7105
not ok 8 - missed conflict if rename not detected # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7106
ok 9 - setup undetected rename/add-source causes data loss
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7107
not ok 10 - detect rename/add-source and preserve all data # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7108
not ok 11 - detect rename/add-source and preserve all data, merge other way # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7109
ok 12 - setup content merge + rename/directory conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7110
ok 13 - rename/directory conflict + clean content merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7111
ok 14 - rename/directory conflict + content merge conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7112
ok 15 - setup content merge + rename/directory conflict w/ disappearing dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7113
ok 16 - disappearing dir in rename/directory conflict handled
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7114
ok 17 - setup rename/rename (2to1) + modify/modify
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7115
ok 18 - handle rename/rename (2to1) conflict correctly
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7116
ok 19 - setup simple rename/rename (1to2) conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7117
ok 20 - merge has correct working tree contents
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7118
ok 21 - setup rename/rename(1to2)/add-source conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7119
not ok 22 - detect conflict with rename/rename(1to2)/add-source merge # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7120
ok 23 - setup rename/rename(1to2)/add-source resolvable conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7121
not ok 24 - rename/rename/add-source still tracks new a file # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7122
ok 25 - setup rename/rename(1to2)/add-dest conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7123
ok 26 - rename/rename/add-dest merge still knows about conflicting file versions
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7124
# still have 7 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7125
# passed all remaining 19 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7126
1..26
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7127
*** t6050-replace.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7128
ok 1 - set up buggy branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7129
ok 2 - replace the author
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7130
ok 3 - test --no-replace-objects option
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7131
ok 4 - test GIT_NO_REPLACE_OBJECTS env variable
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7132
ok 5 - tag replaced commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7133
ok 6 - "git fsck" works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7134
ok 7 - repack, clone and fetch work
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7135
ok 8 - "git replace" listing and deleting
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7136
ok 9 - "git replace" replacing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7137
ok 10 - create parallel branch without the bug
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7138
ok 11 - push to cloned repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7139
ok 12 - push branch with replacement
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7140
ok 13 - fetch branch with replacement
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7141
ok 14 - bisect and replacements
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7142
ok 15 - index-pack and replacements
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7143
ok 16 - not just commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7144
# passed all 16 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7145
1..16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7146
*** t6060-merge-index.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7147
ok 1 - setup diverging branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7148
ok 2 - read-tree does not resolve content merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7149
ok 3 - git merge-index git-merge-one-file resolves
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7150
ok 4 - setup bare merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7151
ok 5 - merge-one-file fails without a work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7152
ok 6 - merge-one-file respects GIT_WORK_TREE
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7153
ok 7 - merge-one-file respects core.worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7154
# passed all 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7155
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7156
*** t6101-rev-parse-parents.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7157
ok 1 - start is valid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7158
ok 2 - start^0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7159
ok 3 - start^1 not valid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7160
ok 4 - second^1 = second^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7161
ok 5 - final^1^1^1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7162
ok 6 - final^1^1^1 = final^^^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7163
ok 7 - final^1^2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7164
ok 8 - final^1^2 != final^1^1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7165
ok 9 - final^1^3 not valid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7166
ok 10 - --verify start2^1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7167
ok 11 - --verify start2^0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7168
ok 12 - final^1^@ = final^1^1 final^1^2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7169
ok 13 - final^1^! = final^1 ^final^1^1 ^final^1^2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7170
ok 14 - repack for next test
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7171
ok 15 - short SHA-1 works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7172
# passed all 15 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7173
1..15
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7174
*** t6110-rev-list-sparse.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7175
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7176
ok 2 - rev-list --first-parent --boundary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7177
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7178
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7179
*** t6120-describe.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7180
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7181
ok 2 - describe HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7182
ok 3 - describe HEAD^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7183
ok 4 - describe HEAD^^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7184
ok 5 - describe HEAD^^2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7185
ok 6 - describe HEAD^^2^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7186
ok 7 - describe HEAD^^^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7187
ok 8 - describe --tags HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7188
ok 9 - describe --tags HEAD^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7189
ok 10 - describe --tags HEAD^^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7190
ok 11 - describe --tags HEAD^^2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7191
ok 12 - describe --tags HEAD^^2^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7192
ok 13 - describe --tags HEAD^^^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7193
ok 14 - describe --all HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7194
ok 15 - describe --all HEAD^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7195
ok 16 - describe --all HEAD^^^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7196
ok 17 - describe --long HEAD^^2^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7197
ok 18 - describe --long HEAD^^2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7198
ok 19 - describe --all A^0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7199
ok 20 - no warning was displayed for A
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7200
ok 21 - rename tag A to Q locally
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7201
ok 22 - describe HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7202
ok 23 - warning was displayed for Q
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7203
ok 24 - rename tag Q back to A
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7204
ok 25 - pack tag refs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7205
ok 26 - describe HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7206
ok 27 - describe --dirty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7207
ok 28 - set-up dirty work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7208
ok 29 - describe --dirty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7209
ok 30 - describe --dirty=.mod
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7210
ok 31 - describe --dirty HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7211
ok 32 - set-up matching pattern tests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7212
ok 33 - describe --match=test-*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7213
ok 34 - describe --tags --match=test1-*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7214
ok 35 - describe --tags --match=test2-*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7215
ok 36 - describe --long --tags --match=test2-* HEAD^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7216
# passed all 36 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7217
1..36
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7218
*** t6200-fmt-merge-msg.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7219
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7220
ok 2 - message for merging local branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7221
ok 3 - message for merging external branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7222
ok 4 - [merge] summary/log configuration
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7223
ok 5 - setup: clear [merge] configuration
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7224
ok 6 - setup FETCH_HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7225
ok 7 - merge.log=3 limits shortlog length
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7226
ok 8 - merge.log=5 shows all 5 commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7227
ok 9 - merge.log=0 disables shortlog
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7228
ok 10 - --log=3 limits shortlog length
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7229
ok 11 - --log=5 shows all 5 commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7230
ok 12 - --no-log disables shortlog
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7231
ok 13 - --log=0 disables shortlog
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7232
ok 14 - fmt-merge-msg -m
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7233
ok 15 - setup: expected shortlog for two branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7234
ok 16 - shortlog for two branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7235
ok 17 - merge-msg -F
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7236
ok 18 - merge-msg -F in subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7237
ok 19 - merge-msg with nothing to merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7238
ok 20 - merge-msg tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7239
ok 21 - merge-msg two tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7240
ok 22 - merge-msg tag and branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7241
ok 23 - merge-msg lots of commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7242
# passed all 23 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7243
1..23
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7244
*** t6300-for-each-ref.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7245
You do not seem to have gpg installed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7246
ok 1 - Create sample commit with known timestamp
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7247
ok 2 - Create upstream config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7248
ok 3 - basic atom: head refname
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7249
ok 4 - basic atom: head upstream
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7250
ok 5 - basic atom: head objecttype
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7251
ok 6 - basic atom: head objectsize
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7252
ok 7 - basic atom: head objectname
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7253
ok 8 - basic atom: head tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7254
ok 9 - basic atom: head parent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7255
ok 10 - basic atom: head numparent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7256
ok 11 - basic atom: head object
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7257
ok 12 - basic atom: head type
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7258
ok 13 - basic atom: head author
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7259
ok 14 - basic atom: head authorname
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7260
ok 15 - basic atom: head authoremail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7261
ok 16 - basic atom: head authordate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7262
ok 17 - basic atom: head committer
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7263
ok 18 - basic atom: head committername
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7264
ok 19 - basic atom: head committeremail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7265
ok 20 - basic atom: head committerdate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7266
ok 21 - basic atom: head tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7267
ok 22 - basic atom: head tagger
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7268
ok 23 - basic atom: head taggername
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7269
ok 24 - basic atom: head taggeremail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7270
ok 25 - basic atom: head taggerdate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7271
ok 26 - basic atom: head creator
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7272
ok 27 - basic atom: head creatordate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7273
ok 28 - basic atom: head subject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7274
ok 29 - basic atom: head contents:subject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7275
ok 30 - basic atom: head body
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7276
ok 31 - basic atom: head contents:body
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7277
ok 32 - basic atom: head contents:signature
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7278
ok 33 - basic atom: head contents
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7279
ok 34 - basic atom: tag refname
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7280
ok 35 - basic atom: tag upstream
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7281
ok 36 - basic atom: tag objecttype
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7282
ok 37 - basic atom: tag objectsize
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7283
ok 38 - basic atom: tag objectname
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7284
ok 39 - basic atom: tag tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7285
ok 40 - basic atom: tag parent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7286
ok 41 - basic atom: tag numparent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7287
ok 42 - basic atom: tag object
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7288
ok 43 - basic atom: tag type
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7289
ok 44 - basic atom: tag author
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7290
ok 45 - basic atom: tag authorname
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7291
ok 46 - basic atom: tag authoremail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7292
ok 47 - basic atom: tag authordate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7293
ok 48 - basic atom: tag committer
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7294
ok 49 - basic atom: tag committername
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7295
ok 50 - basic atom: tag committeremail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7296
ok 51 - basic atom: tag committerdate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7297
ok 52 - basic atom: tag tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7298
ok 53 - basic atom: tag tagger
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7299
ok 54 - basic atom: tag taggername
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7300
ok 55 - basic atom: tag taggeremail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7301
ok 56 - basic atom: tag taggerdate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7302
ok 57 - basic atom: tag creator
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7303
ok 58 - basic atom: tag creatordate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7304
ok 59 - basic atom: tag subject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7305
ok 60 - basic atom: tag contents:subject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7306
ok 61 - basic atom: tag body
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7307
ok 62 - basic atom: tag contents:body
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7308
ok 63 - basic atom: tag contents:signature
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7309
ok 64 - basic atom: tag contents
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7310
ok 65 - Check invalid atoms names are errors
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7311
ok 66 - Check format specifiers are ignored in naming date atoms
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7312
ok 67 - Check valid format specifiers for date fields
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7313
ok 68 - Check invalid format specifiers are errors
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7314
ok 69 - Check unformatted date fields output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7315
ok 70 - Check format "default" formatted date fields output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7316
ok 71 - Check format "relative" date fields output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7317
ok 72 - Check format "short" date fields output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7318
ok 73 - Check format "local" date fields output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7319
ok 74 - Check format "iso8601" date fields output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7320
ok 75 - Check format "rfc2822" date fields output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7321
ok 76 - Verify ascending sort
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7322
ok 77 - Verify descending sort
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7323
ok 78 - Quoting style: shell
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7324
ok 79 - Quoting style: perl
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7325
ok 80 - Quoting style: python
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7326
ok 81 - Quoting style: tcl
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7327
ok 82 - more than one quoting style: --perl --shell
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7328
ok 83 - more than one quoting style: -s --python
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7329
ok 84 - more than one quoting style: --python --tcl
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7330
ok 85 - more than one quoting style: --tcl --perl
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7331
ok 86 - Check short refname format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7332
ok 87 - Check short upstream format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7333
ok 88 - Check short objectname format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7334
ok 89 - Check for invalid refname format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7335
ok 90 - Check ambiguous head and tag refs (strict)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7336
ok 91 - Check ambiguous head and tag refs (loose)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7337
ok 92 - Check ambiguous head and tag refs II (loose)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7338
ok 93 - an unusual tag with an incomplete line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7339
ok 94 - create tag with subject and body content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7340
ok 95 - basic atom: refs/tags/subject-body subject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7341
ok 96 - basic atom: refs/tags/subject-body body
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7342
ok 97 - basic atom: refs/tags/subject-body contents
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7343
ok 98 - create tag with multiline subject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7344
ok 99 - basic atom: refs/tags/multiline subject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7345
ok 100 - basic atom: refs/tags/multiline contents:subject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7346
ok 101 - basic atom: refs/tags/multiline body
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7347
ok 102 - basic atom: refs/tags/multiline contents:body
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7348
ok 103 - basic atom: refs/tags/multiline contents:signature
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7349
ok 104 - basic atom: refs/tags/multiline contents
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7350
ok 105 # skip create signed tags (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7351
ok 106 # skip basic atom: refs/tags/signed-empty subject (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7352
ok 107 # skip basic atom: refs/tags/signed-empty contents:subject (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7353
ok 108 # skip basic atom: refs/tags/signed-empty body (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7354
ok 109 # skip basic atom: refs/tags/signed-empty contents:body (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7355
ok 110 # skip basic atom: refs/tags/signed-empty contents:signature (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7356
ok 111 # skip basic atom: refs/tags/signed-empty contents (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7357
ok 112 # skip basic atom: refs/tags/signed-short subject (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7358
ok 113 # skip basic atom: refs/tags/signed-short contents:subject (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7359
ok 114 # skip basic atom: refs/tags/signed-short body (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7360
ok 115 # skip basic atom: refs/tags/signed-short contents:body (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7361
ok 116 # skip basic atom: refs/tags/signed-short contents:signature (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7362
ok 117 # skip basic atom: refs/tags/signed-short contents (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7363
ok 118 # skip basic atom: refs/tags/signed-long subject (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7364
ok 119 # skip basic atom: refs/tags/signed-long contents:subject (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7365
ok 120 # skip basic atom: refs/tags/signed-long body (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7366
ok 121 # skip basic atom: refs/tags/signed-long contents:body (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7367
ok 122 # skip basic atom: refs/tags/signed-long contents:signature (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7368
ok 123 # skip basic atom: refs/tags/signed-long contents (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7369
# passed all 123 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7370
1..123
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7371
*** t6500-gc.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7372
ok 1 - gc empty repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7373
ok 2 - gc --gobbledegook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7374
ok 3 - gc -h with invalid configuration
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7375
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7376
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7377
*** t7001-mv.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7378
ok 1 - prepare reference tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7379
ok 2 - moving the file out of subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7380
ok 3 - commiting the change
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7381
ok 4 - checking the commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7382
ok 5 - moving the file back into subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7383
ok 6 - commiting the change
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7384
ok 7 - checking the commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7385
ok 8 - checking -k on non-existing file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7386
ok 9 - checking -k on untracked file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7387
ok 10 - checking -k on multiple untracked files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7388
ok 11 - checking -f on untracked file with existing target
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7389
ok 12 - adding another file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7390
ok 13 - moving whole subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7391
ok 14 - commiting the change
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7392
ok 15 - checking the commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7393
ok 16 - succeed when source is a prefix of destination
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7394
ok 17 - moving whole subdirectory into subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7395
ok 18 - commiting the change
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7396
ok 19 - checking the commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7397
ok 20 - do not move directory over existing directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7398
ok 21 - move into "."
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7399
ok 22 - Michael Cassar's test case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7400
ok 23 - Sergey Vlasov's test case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7401
ok 24 - absolute pathname
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7402
ok 25 - absolute pathname outside should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7403
ok 26 - git mv to move multiple sources into a directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7404
ok 27 - git mv should not change sha1 of moved cache entry
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7405
ok 28 - git mv should overwrite symlink to a file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7406
ok 29 - git mv should overwrite file with a symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7407
# passed all 29 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7408
1..29
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7409
*** t7003-filter-branch.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7410
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7411
ok 2 - rewrite identically
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7412
ok 3 - result is really identical
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7413
ok 4 - rewrite bare repository identically
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7414
ok 5 - result is really identical
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7415
ok 6 - correct GIT_DIR while using -d
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7416
ok 7 - Fail if commit filter fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7417
ok 8 - rewrite, renaming a specific file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7418
ok 9 - test that the file was renamed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7419
ok 10 - rewrite, renaming a specific directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7420
ok 11 - test that the directory was renamed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7421
ok 12 - rewrite one branch, keeping a side branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7422
ok 13 - common ancestor is still common (unchanged)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7423
ok 14 - filter subdirectory only
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7424
ok 15 - subdirectory filter result looks okay
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7425
ok 16 - more setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7426
ok 17 - use index-filter to move into a subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7427
ok 18 - stops when msg filter fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7428
ok 19 - author information is preserved
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7429
ok 20 - remove a certain author's commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7430
ok 21 - barf on invalid name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7431
ok 22 - "map" works in commit filter
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7432
ok 23 - Name needing quotes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7433
ok 24 - Subdirectory filter with disappearing trees
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7434
ok 25 - Tag name filtering retains tag message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7435
ok 26 - Tag name filtering strips gpg signature
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7436
ok 27 - Tag name filtering allows slashes in tag names
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7437
ok 28 - Prune empty commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7438
ok 29 - --remap-to-ancestor with filename filters
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7439
ok 30 - automatic remapping to ancestor with filename filters
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7440
ok 31 - setup submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7441
ok 32 - rewrite submodule with another content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7442
ok 33 - replace submodule revision
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7443
# passed all 33 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7444
1..33
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7445
*** t7004-tag.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7446
You do not seem to have gpg installed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7447
ok 1 - listing all tags in an empty tree should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7448
ok 2 - listing all tags in an empty tree should output nothing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7449
ok 3 - looking for a tag in an empty tree should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7450
ok 4 - creating a tag in an empty tree should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7451
ok 5 - creating a tag for HEAD in an empty tree should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7452
ok 6 - creating a tag for an unknown revision should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7453
ok 7 - creating a tag using default HEAD should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7454
ok 8 - listing all tags if one exists should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7455
ok 9 - listing all tags if one exists should output that tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7456
ok 10 - listing a tag using a matching pattern should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7457
ok 11 - listing a tag using a matching pattern should output that tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7458
ok 12 - listing tags using a non-matching pattern should suceed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7459
ok 13 - listing tags using a non-matching pattern should output nothing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7460
ok 14 - trying to create a tag with the name of one existing should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7461
ok 15 - trying to create a tag with a non-valid name should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7462
ok 16 - creating a tag using HEAD directly should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7463
ok 17 - trying to delete an unknown tag should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7464
ok 18 - trying to delete tags without params should succeed and do nothing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7465
ok 19 - deleting two existing tags in one command should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7466
ok 20 - creating a tag with the name of another deleted one should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7467
ok 21 - trying to delete two tags, existing and not, should fail in the 2nd
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7468
ok 22 - trying to delete an already deleted tag should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7469
ok 23 - listing all tags should print them ordered
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7470
ok 24 - listing tags with substring as pattern must print those matching
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7471
ok 25 - listing tags with a suffix as pattern must print those matching
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7472
ok 26 - listing tags with a prefix as pattern must print those matching
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7473
ok 27 - listing tags using a name as pattern must print that one matching
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7474
ok 28 - listing tags using a name as pattern must print that one matching
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7475
ok 29 - listing tags with ? in the pattern should print those matching
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7476
ok 30 - listing tags using v.* should print nothing because none have v.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7477
ok 31 - listing tags using v* should print only those having v
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7478
ok 32 - tag -l can accept multiple patterns
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7479
ok 33 - a non-annotated tag created without parameters should point to HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7480
ok 34 - trying to verify an unknown tag should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7481
ok 35 - trying to verify a non-annotated and non-signed tag should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7482
ok 36 - trying to verify many non-annotated or unknown tags, should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7483
ok 37 - creating an annotated tag with -m message should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7484
ok 38 - creating an annotated tag with -F messagefile should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7485
ok 39 - creating an annotated tag with -F - should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7486
ok 40 - trying to create a tag with a non-existing -F file should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7487
ok 41 - trying to create tags giving both -m or -F options should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7488
ok 42 - creating a tag with an empty -m message should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7489
ok 43 - creating a tag with an empty -F messagefile should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7490
ok 44 - extra blanks in the message for an annotated tag should be removed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7491
ok 45 - creating a tag with blank -m message with spaces should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7492
ok 46 - creating a tag with blank -F messagefile with spaces should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7493
ok 47 - creating a tag with -F file of spaces and no newline should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7494
ok 48 - creating a tag using a -F messagefile with #comments should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7495
ok 49 - creating a tag with a #comment in the -m message should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7496
ok 50 - creating a tag with #comments in the -F messagefile should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7497
ok 51 - creating a tag with a file of #comment and no newline should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7498
ok 52 - listing the one-line message of a non-signed tag should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7499
ok 53 - listing the zero-lines message of a non-signed tag should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7500
ok 54 - listing many message lines of a non-signed tag should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7501
ok 55 - annotations for blobs are empty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7502
ok 56 # skip trying to verify an annotated non-signed tag should fail (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7503
ok 57 # skip trying to verify a file-annotated non-signed tag should fail (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7504
ok 58 # skip trying to verify two annotated non-signed tags should fail (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7505
ok 59 # skip creating a signed tag with -m message should succeed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7506
ok 60 # skip sign with a given key id (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7507
ok 61 # skip sign with an unknown id (1) (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7508
ok 62 # skip sign with an unknown id (2) (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7509
ok 63 # skip -u implies signed tag (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7510
ok 64 # skip creating a signed tag with -F messagefile should succeed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7511
ok 65 # skip creating a signed tag with -F - should succeed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7512
ok 66 # skip -s implies annotated tag (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7513
ok 67 # skip trying to create a signed tag with non-existing -F file should fail (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7514
ok 68 # skip verifying a signed tag should succeed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7515
ok 69 # skip verifying two signed tags in one command should succeed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7516
ok 70 # skip verifying many signed and non-signed tags should fail (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7517
ok 71 # skip verifying a forged tag should fail (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7518
ok 72 # skip creating a signed tag with an empty -m message should succeed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7519
ok 73 # skip creating a signed tag with an empty -F messagefile should succeed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7520
ok 74 # skip extra blanks in the message for a signed tag should be removed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7521
ok 75 # skip creating a signed tag with a blank -m message should succeed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7522
ok 76 # skip creating a signed tag with blank -F file with spaces should succeed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7523
ok 77 # skip creating a signed tag with spaces and no newline should succeed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7524
ok 78 # skip creating a signed tag with a -F file with #comments should succeed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7525
ok 79 # skip creating a signed tag with #commented -m message should succeed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7526
ok 80 # skip creating a signed tag with #commented -F messagefile should succeed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7527
ok 81 # skip creating a signed tag with a #comment and no newline should succeed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7528
ok 82 # skip listing the one-line message of a signed tag should succeed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7529
ok 83 # skip listing the zero-lines message of a signed tag should succeed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7530
ok 84 # skip listing many message lines of a signed tag should succeed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7531
ok 85 # skip creating a signed tag pointing to a tree should succeed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7532
ok 86 # skip creating a signed tag pointing to a blob should succeed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7533
ok 87 # skip creating a signed tag pointing to another tag should succeed (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7534
t7004-tag.sh: line 1025: gpghome/gpg.conf: No such file or directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7535
ok 88 # skip creating a signed tag with rfc1991 (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7536
ok 89 # skip reediting a signed tag body omits signature (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7537
ok 90 # skip verifying rfc1991 signature (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7538
ok 91 # skip list tag with rfc1991 signature (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7539
ok 92 # skip verifying rfc1991 signature without --rfc1991 (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7540
ok 93 # skip list tag with rfc1991 signature without --rfc1991 (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7541
ok 94 # skip reediting a signed tag body omits signature (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7542
ok 95 # skip git tag -s fails if gpg is misconfigured (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7543
ok 96 # skip verify signed tag fails when public key is not present (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7544
ok 97 - git tag -a fails if tag annotation is empty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7545
ok 98 - message in editor has initial comment
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7546
ok 99 - message in editor has initial comment: first line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7547
ok 100 - message in editor has initial comment: remainder
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7548
ok 101 - overwriting an annoted tag should use its previous body
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7549
ok 102 - filename for the message is relative to cwd
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7550
ok 103 - filename for the message is relative to cwd
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7551
ok 104 - creating second commit and tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7552
ok 105 - creating third commit without tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7553
ok 106 - checking that first commit is in all tags (hash)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7554
ok 107 - checking that first commit is in all tags (tag)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7555
ok 108 - checking that first commit is in all tags (relative)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7556
ok 109 - checking that second commit only has one tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7557
ok 110 - checking that third commit has no tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7558
ok 111 - creating simple branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7559
ok 112 - checking that branch head only has one tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7560
ok 113 - merging original branch into this branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7561
ok 114 - checking that original branch head has one tag now
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7562
ok 115 - checking that initial commit is in all tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7563
ok 116 - mixing incompatibles modes and options is forbidden
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7564
# passed all 116 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7565
1..116
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7566
*** t7005-editor.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7567
ok 1 - determine default editor
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7568
ok 2 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7569
ok 3 - dumb should error out when falling back on vi
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7570
ok 4 - dumb should prefer EDITOR to VISUAL
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7571
ok 5 - Using vi
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7572
ok 6 - Using EDITOR
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7573
ok 7 - Using VISUAL
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7574
ok 8 - Using core_editor
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7575
ok 9 - Using GIT_EDITOR
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7576
ok 10 - Using vi (override)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7577
ok 11 - Using EDITOR (override)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7578
ok 12 - Using VISUAL (override)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7579
ok 13 - Using core_editor (override)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7580
ok 14 - Using GIT_EDITOR (override)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7581
ok 15 - editor with a space
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7582
ok 16 - core.editor with a space
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7583
# passed all 16 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7584
1..16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7585
*** t7006-pager.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7586
ok 1 - determine default pager
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7587
ok 2 - set up terminal for tests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7588
ok 3 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7589
ok 4 # skip some commands use a pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7590
ok 5 # skip pager runs from subdir (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7591
ok 6 # skip some commands do not use a pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7592
ok 7 - no pager when stdout is a pipe
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7593
ok 8 - no pager when stdout is a regular file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7594
ok 9 # skip git --paginate rev-list uses a pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7595
ok 10 - no pager even with --paginate when stdout is a pipe
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7596
ok 11 # skip no pager with --no-pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7597
ok 12 # skip configuration can disable pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7598
ok 13 # skip git config uses a pager if configured to (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7599
ok 14 # skip configuration can enable pager (from subdir) (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7600
ok 15 - tests can detect color
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7601
ok 16 - no color when stdout is a regular file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7602
ok 17 # skip color when writing to a pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7603
ok 18 # skip colors are suppressed by color.pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7604
ok 19 - color when writing to a file intended for a pager
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7605
ok 20 # skip colors are sent to pager for external commands (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7606
ok 21 - setup: some aliases
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7607
ok 22 # skip git log - default pager is used by default (missing TTY of SIMPLEPAGER,TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7608
ok 23 # skip git log - PAGER overrides default pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7609
ok 24 # skip git log - repository-local core.pager setting overrides PAGER (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7610
ok 25 # skip git log - core.pager overrides PAGER from subdirectory (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7611
ok 26 # skip git log - GIT_PAGER overrides core.pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7612
ok 27 # skip git -p log - default pager is used by default (missing TTY of SIMPLEPAGER,TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7613
ok 28 # skip git -p log - PAGER overrides default pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7614
ok 29 # skip git -p log - repository-local core.pager setting overrides PAGER (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7615
ok 30 # skip git -p log - core.pager overrides PAGER from subdirectory (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7616
ok 31 # skip git -p log - GIT_PAGER overrides core.pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7617
ok 32 # skip git aliasedlog - default pager is used by default (missing TTY of SIMPLEPAGER,TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7618
ok 33 # skip git aliasedlog - PAGER overrides default pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7619
ok 34 # skip git aliasedlog - repository-local core.pager setting overrides PAGER (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7620
ok 35 # skip git aliasedlog - core.pager overrides PAGER from subdirectory (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7621
ok 36 # skip git aliasedlog - GIT_PAGER overrides core.pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7622
ok 37 # skip git -p aliasedlog - default pager is used by default (missing TTY of SIMPLEPAGER,TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7623
ok 38 # skip git -p aliasedlog - PAGER overrides default pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7624
ok 39 # skip git -p aliasedlog - repository-local core.pager setting overrides PAGER (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7625
ok 40 # skip git -p aliasedlog - core.pager overrides PAGER from subdirectory (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7626
ok 41 # skip git -p aliasedlog - GIT_PAGER overrides core.pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7627
ok 42 # skip git -p true - default pager is used by default (missing TTY of SIMPLEPAGER,TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7628
ok 43 # skip git -p true - PAGER overrides default pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7629
ok 44 # skip git -p true - repository-local core.pager setting overrides PAGER (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7630
ok 45 # skip git -p true - core.pager overrides PAGER from subdirectory (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7631
ok 46 # skip git -p true - GIT_PAGER overrides core.pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7632
ok 47 # skip git -p request-pull - default pager is used by default (missing TTY of SIMPLEPAGER,TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7633
ok 48 # skip git -p request-pull - PAGER overrides default pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7634
ok 49 # skip git -p request-pull - repository-local core.pager setting overrides PAGER (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7635
ok 50 # skip git -p request-pull - core.pager overrides PAGER from subdirectory (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7636
ok 51 # skip git -p request-pull - GIT_PAGER overrides core.pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7637
ok 52 # skip git -p - default pager is used by default (missing TTY of SIMPLEPAGER,TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7638
ok 53 # skip git -p - PAGER overrides default pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7639
ok 54 # skip git -p - repository-local core.pager setting is not used (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7640
ok 55 # skip git -p - core.pager is not used from subdirectory (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7641
ok 56 # skip git -p - GIT_PAGER overrides core.pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7642
ok 57 # skip no pager for 'git -p nonsense' (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7643
ok 58 # skip git shortlog - default pager is used by default (missing TTY of SIMPLEPAGER,TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7644
ok 59 # skip git shortlog - PAGER overrides default pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7645
ok 60 # skip git shortlog - repository-local core.pager setting overrides PAGER (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7646
ok 61 # skip git shortlog - core.pager overrides PAGER from subdirectory (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7647
ok 62 # skip git shortlog - GIT_PAGER overrides core.pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7648
ok 63 - setup: configure shortlog not to paginate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7649
ok 64 # skip no pager for 'git shortlog' (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7650
ok 65 # skip git shortlog - core.pager is not used from subdirectory (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7651
ok 66 # skip git -p shortlog - default pager is used by default (missing TTY of SIMPLEPAGER,TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7652
ok 67 # skip git -p shortlog - core.pager overrides PAGER from subdirectory (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7653
ok 68 # skip git -p apply </dev/null - core.pager overrides PAGER from subdirectory (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7654
ok 69 # skip command-specific pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7655
ok 70 # skip command-specific pager overrides core.pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7656
ok 71 # skip command-specific pager overridden by environment (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7657
ok 72 - setup external command
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7658
ok 73 # skip command-specific pager works for external commands (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7659
ok 74 # skip sub-commands of externals use their own pager (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7660
ok 75 # skip external command pagers override sub-commands (missing TTY)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7661
# passed all 75 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7662
1..75
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7663
*** t7007-show.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7664
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7665
ok 2 - showing a tag that point at a missing object
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7666
# passed all 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7667
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7668
*** t7008-grep-binary.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7669
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7670
ok 2 - git grep ina a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7671
ok 3 - git grep -ah ina a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7672
ok 4 - git grep -I ina a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7673
ok 5 - git grep -c ina a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7674
ok 6 - git grep -l ina a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7675
ok 7 - git grep -L bar a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7676
ok 8 - git grep -q ina a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7677
ok 9 - git grep -F ile a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7678
ok 10 - git grep -Fi iLE a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7679
ok 11 - git grep ile a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7680
not ok 12 - git grep .fi a # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7681
ok 13 - git grep -F y<NUL>f a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7682
ok 14 - git grep -F y<NUL>x a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7683
ok 15 - git grep -Fi Y<NUL>f a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7684
ok 16 - git grep -Fi Y<NUL>x a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7685
ok 17 - git grep y<NUL>f a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7686
ok 18 - git grep y<NUL>x a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7687
ok 19 - grep respects binary diff attribute
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7688
ok 20 - grep respects not-binary diff attribute
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7689
# still have 1 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7690
# passed all remaining 19 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7691
1..20
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7692
*** t7010-setup.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7693
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7694
ok 2 - git add (absolute)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7695
ok 3 - git add (funny relative)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7696
ok 4 - git rm (absolute)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7697
ok 5 - git rm (funny relative)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7698
ok 6 - git ls-files (absolute)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7699
ok 7 - git ls-files (relative #1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7700
ok 8 - git ls-files (relative #2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7701
ok 9 - git ls-files (relative #3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7702
ok 10 - commit using absolute path names
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7703
ok 11 - log using absolute path names
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7704
ok 12 - blame using absolute path names
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7705
ok 13 - setup deeper work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7706
ok 14 - add a directory outside the work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7707
ok 15 - add a file outside the work tree, nasty case 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7708
ok 16 - add a file outside the work tree, nasty case 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7709
# passed all 16 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7710
1..16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7711
*** t7011-skip-worktree-reading.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7712
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7713
ok 2 - update-index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7714
ok 3 - update-index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7715
ok 4 - update-index --remove
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7716
ok 5 - update-index --remove
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7717
ok 6 - ls-files --delete
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7718
ok 7 - ls-files --delete
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7719
ok 8 - ls-files --modified
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7720
ok 9 - ls-files --modified
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7721
ok 10 - grep with skip-worktree file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7722
ok 11 - diff-index does not examine skip-worktree absent entries
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7723
ok 12 - diff-index does not examine skip-worktree dirty entries
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7724
ok 13 - diff-files does not examine skip-worktree absent entries
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7725
ok 14 - diff-files does not examine skip-worktree dirty entries
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7726
ok 15 - git-rm succeeds on skip-worktree absent entries
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7727
ok 16 - commit on skip-worktree absent entries
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7728
ok 17 - commit on skip-worktree dirty entries
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7729
# passed all 17 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7730
1..17
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7731
*** t7012-skip-worktree-writing.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7732
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7733
ok 2 - read-tree updates worktree, absent case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7734
ok 3 - read-tree updates worktree, dirty case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7735
ok 4 - read-tree removes worktree, absent case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7736
ok 5 - read-tree removes worktree, dirty case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7737
ok 6 - index setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7738
ok 7 - git-add ignores worktree content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7739
ok 8 - git-add ignores worktree content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7740
ok 9 - git-rm fails if worktree is dirty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7741
ok 10 - git-clean, absent case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7742
ok 11 - git-clean, dirty case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7743
# passed all 11 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7744
1..11
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7745
*** t7060-wtstatus.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7746
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7747
ok 2 - A/A conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7748
ok 3 - Report path with conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7749
ok 4 - Report new path with conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7750
ok 5 - M/D conflict does not segfault
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7751
ok 6 - rename & unmerged setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7752
ok 7 - rename & unmerged status
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7753
ok 8 - git diff-index --cached shows 2 added + 1 unmerged
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7754
ok 9 - git diff-index --cached -M shows 2 added + 1 unmerged
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7755
ok 10 - git diff-index --cached -C shows 2 copies + 1 unmerged
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7756
# passed all 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7757
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7758
*** t7101-reset.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7759
ok 1 - creating initial files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7760
ok 2 - creating second files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7761
ok 3 - resetting tree HEAD^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7762
ok 4 - checking initial files exist after rewind
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7763
ok 5 - checking lack of path1/path2/COPYING
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7764
ok 6 - checking lack of path1/COPYING
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7765
ok 7 - checking lack of COPYING
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7766
ok 8 - checking checking lack of path1/COPYING-TOO
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7767
ok 9 - checking lack of path1/path2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7768
ok 10 - checking lack of path1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7769
# passed all 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7770
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7771
*** t7102-reset.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7772
ok 1 - creating initial files and commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7773
ok 2 - giving a non existing revision should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7774
ok 3 - reset --soft with unmerged index should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7775
ok 4 - giving paths with options different than --mixed should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7776
ok 5 - giving unrecognized options should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7777
ok 6 - trying to do reset --soft with pending merge should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7778
ok 7 - trying to do reset --soft with pending checkout merge should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7779
ok 8 - resetting to HEAD with no changes should succeed and do nothing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7780
ok 9 - --soft reset only should show changes in diff --cached
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7781
ok 10 - changing files and redo the last commit should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7782
ok 11 - --hard reset should change the files and undo commits permanently
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7783
ok 12 - redoing changes adding them without commit them should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7784
ok 13 - --mixed reset to HEAD should unadd the files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7785
ok 14 - redoing the last two commits should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7786
ok 15 - --hard reset to HEAD should clear a failed merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7787
ok 16 - --hard reset to ORIG_HEAD should clear a fast-forward merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7788
ok 17 - test --mixed <paths>
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7789
ok 18 - test resetting the index at give paths
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7790
ok 19 - resetting an unmodified path is a no-op
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7791
ok 20 - --mixed refreshes the index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7792
ok 21 - resetting specific path that is unmerged
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7793
ok 22 - disambiguation (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7794
ok 23 - disambiguation (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7795
ok 24 - disambiguation (3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7796
ok 25 - disambiguation (4)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7797
# passed all 25 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7798
1..25
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7799
*** t7103-reset-bare.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7800
ok 1 - setup non-bare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7801
ok 2 - "hard" reset requires a worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7802
ok 3 - "merge" reset requires a worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7803
ok 4 - "keep" reset requires a worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7804
ok 5 - "mixed" reset is ok
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7805
ok 6 - "soft" reset is ok
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7806
ok 7 - hard reset works with GIT_WORK_TREE
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7807
ok 8 - setup bare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7808
ok 9 - "hard" reset is not allowed in bare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7809
ok 10 - "merge" reset is not allowed in bare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7810
ok 11 - "keep" reset is not allowed in bare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7811
ok 12 - "mixed" reset is not allowed in bare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7812
ok 13 - "soft" reset is allowed in bare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7813
# passed all 13 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7814
1..13
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7815
*** t7104-reset.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7816
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7817
ok 2 - reset --hard should restore unmerged ones
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7818
ok 3 - reset --hard did not corrupt index nor cached-tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7819
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7820
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7821
*** t7105-reset-patch.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7822
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7823
ok 2 - saying "n" does nothing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7824
ok 3 - git reset -p
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7825
ok 4 - git reset -p HEAD^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7826
ok 5 - git reset -p dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7827
ok 6 - git reset -p -- foo (inside dir)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7828
ok 7 - git reset -p HEAD^ -- dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7829
ok 8 - none of this moved HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7830
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7831
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7832
*** t7110-reset-merge.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7833
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7834
ok 2 - reset --merge is ok with changes in file it does not touch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7835
ok 3 - reset --merge is ok when switching back
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7836
ok 4 - reset --keep is ok with changes in file it does not touch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7837
ok 5 - reset --keep is ok when switching back
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7838
ok 6 - reset --merge discards changes added to index (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7839
ok 7 - reset --merge is ok again when switching back (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7840
ok 8 - reset --keep fails with changes in index in files it touches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7841
ok 9 - reset --merge discards changes added to index (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7842
ok 10 - reset --merge is ok again when switching back (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7843
ok 11 - reset --keep keeps changes it does not touch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7844
ok 12 - reset --keep keeps changes when switching back
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7845
ok 13 - reset --merge fails with changes in file it touches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7846
ok 14 - reset --keep fails with changes in file it touches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7847
ok 15 - setup 3 different branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7848
ok 16 - "reset --merge HEAD^" is ok with pending merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7849
ok 17 - "reset --keep HEAD^" fails with pending merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7850
ok 18 - "reset --merge HEAD" is ok with pending merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7851
ok 19 - "reset --keep HEAD" fails with pending merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7852
ok 20 - --merge is ok with added/deleted merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7853
ok 21 - --keep fails with added/deleted merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7854
# passed all 21 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7855
1..21
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7856
*** t7111-reset-table.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7857
ok 1 - creating initial commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7858
ok 2 - check: A B C D --soft A B D
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7859
ok 3 - check: A B C D --mixed A D D
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7860
ok 4 - check: A B C D --hard D D D
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7861
ok 5 - check: A B C D --merge XXXXX  
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7862
ok 6 - check: A B C D --keep XXXXX  
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7863
ok 7 - check: A B C C --soft A B C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7864
ok 8 - check: A B C C --mixed A C C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7865
ok 9 - check: A B C C --hard C C C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7866
ok 10 - check: A B C C --merge XXXXX  
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7867
ok 11 - check: A B C C --keep A C C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7868
ok 12 - check: B B C D --soft B B D
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7869
ok 13 - check: B B C D --mixed B D D
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7870
ok 14 - check: B B C D --hard D D D
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7871
ok 15 - check: B B C D --merge D D D
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7872
ok 16 - check: B B C D --keep XXXXX  
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7873
ok 17 - check: B B C C --soft B B C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7874
ok 18 - check: B B C C --mixed B C C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7875
ok 19 - check: B B C C --hard C C C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7876
ok 20 - check: B B C C --merge C C C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7877
ok 21 - check: B B C C --keep B C C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7878
ok 22 - check: B C C D --soft B C D
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7879
ok 23 - check: B C C D --mixed B D D
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7880
ok 24 - check: B C C D --hard D D D
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7881
ok 25 - check: B C C D --merge XXXXX  
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7882
ok 26 - check: B C C D --keep XXXXX  
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7883
ok 27 - check: B C C C --soft B C C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7884
ok 28 - check: B C C C --mixed B C C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7885
ok 29 - check: B C C C --hard C C C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7886
ok 30 - check: B C C C --merge B C C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7887
ok 31 - check: B C C C --keep B C C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7888
ok 32 - setting up branches to test with unmerged entries
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7889
ok 33 - check: X U B C --soft XXXXX  
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7890
ok 34 - check: X U B C --mixed X C C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7891
ok 35 - check: X U B C --hard C C C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7892
ok 36 - check: X U B C --merge C C C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7893
ok 37 - check: X U B C --keep XXXXX  
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7894
ok 38 - check: X U B B --soft XXXXX  
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7895
ok 39 - check: X U B B --mixed X B B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7896
ok 40 - check: X U B B --hard B B B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7897
ok 41 - check: X U B B --merge B B B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7898
ok 42 - check: X U B B --keep XXXXX  
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7899
# passed all 42 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7900
1..42
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7901
*** t7201-co.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7902
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7903
ok 2 - checkout from non-existing branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7904
ok 3 - checkout with dirty tree without -m
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7905
ok 4 - checkout with unrelated dirty tree without -m
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7906
ok 5 - checkout -m with dirty tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7907
ok 6 - checkout -m with dirty tree, renamed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7908
ok 7 - checkout -m with merge conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7909
ok 8 - format of merge conflict from checkout -m
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7910
ok 9 - checkout --merge --conflict=diff3 <branch>
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7911
ok 10 - checkout to detach HEAD (with advice declined)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7912
ok 11 - checkout to detach HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7913
ok 12 - checkout to detach HEAD with branchname^
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7914
ok 13 - checkout to detach HEAD with :/message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7915
ok 14 - checkout to detach HEAD with HEAD^0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7916
ok 15 - checkout with ambiguous tag/branch names
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7917
ok 16 - checkout with ambiguous tag/branch names
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7918
ok 17 - switch branches while in subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7919
ok 18 - checkout specific path while in subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7920
ok 19 - checkout w/--track sets up tracking
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7921
ok 20 - checkout w/autosetupmerge=always sets up tracking
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7922
ok 21 - checkout w/--track from non-branch HEAD fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7923
ok 22 - checkout w/--track from tag fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7924
ok 23 - detach a symbolic link HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7925
ok 24 - checkout with --track fakes a sensible -b <name>
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7926
ok 25 - checkout with --track, but without -b, fails with too short tracked name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7927
ok 26 - checkout an unmerged path should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7928
ok 27 - checkout with an unmerged path can be ignored
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7929
ok 28 - checkout unmerged stage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7930
ok 29 - checkout with --merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7931
ok 30 - checkout with --merge, in diff3 -m style
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7932
ok 31 - checkout --conflict=merge, overriding config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7933
ok 32 - checkout --conflict=diff3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7934
ok 33 - failing checkout -b should not break working tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7935
ok 34 - switch out of non-branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7936
ok 35 - custom merge driver with checkout -m
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7937
# passed all 35 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7938
1..35
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7939
*** t7300-clean.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7940
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7941
ok 2 - git clean with skip-worktree .gitignore
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7942
ok 3 - git clean
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7943
ok 4 - git clean src/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7944
ok 5 - git clean src/ src/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7945
ok 6 - git clean with prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7946
ok 7 - git clean with relative prefix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7947
ok 8 - git clean with absolute path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7948
ok 9 - git clean with out of work tree relative path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7949
ok 10 - git clean with out of work tree absolute path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7950
ok 11 - git clean -d with prefix and path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7951
ok 12 - git clean symbolic link
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7952
ok 13 - git clean with wildcard
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7953
ok 14 - git clean -n
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7954
ok 15 - git clean -d
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7955
ok 16 - git clean -d src/ examples/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7956
ok 17 - git clean -x
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7957
ok 18 - git clean -d -x
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7958
ok 19 - git clean -X
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7959
ok 20 - git clean -d -X
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7960
ok 21 - clean.requireForce defaults to true
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7961
ok 22 - clean.requireForce
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7962
ok 23 - clean.requireForce and -n
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7963
ok 24 - clean.requireForce and -f
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7964
ok 25 - core.excludesfile
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7965
ok 26 - removal failure
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7966
ok 27 - nested git work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7967
ok 28 - force removal of nested git work tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7968
ok 29 - git clean -e
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7969
ok 30 - git clean -d with an unreadable empty directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7970
# passed all 30 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7971
1..30
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7972
*** t7400-submodule-basic.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7973
ok 1 - setup - initial commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7974
ok 2 - setup - repository in init subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7975
ok 3 - setup - commit with gitlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7976
ok 4 - setup - hide init subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7977
ok 5 - setup - repository to add submodules to
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7978
ok 6 - submodule add
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7979
ok 7 - submodule add to .gitignored path fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7980
ok 8 - submodule add to .gitignored path with --force
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7981
ok 9 - submodule add --branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7982
ok 10 - submodule add with ./ in path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7983
ok 11 - submodule add with // in path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7984
ok 12 - submodule add with /.. in path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7985
ok 13 - submodule add with ./, /.. and // in path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7986
ok 14 - setup - add an example entry to .gitmodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7987
ok 15 - status should fail for unmapped paths
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7988
ok 16 - setup - map path in .gitmodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7989
ok 17 - status should only print one line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7990
ok 18 - setup - fetch commit name from submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7991
ok 19 - status should initially be "missing"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7992
ok 20 - init should register submodule url in .git/config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7993
ok 21 - update should fail when path is used by a file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7994
ok 22 - update should fail when path is used by a nonempty directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7995
ok 23 - update should work when path is an empty dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7996
ok 24 - status should be "up-to-date" after update
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7997
ok 25 - status should be "modified" after submodule commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7998
ok 26 - the --cached sha1 should be rev1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  7999
ok 27 - git diff should report the SHA1 of the new submodule commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8000
ok 28 - update should checkout rev1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8001
ok 29 - status should be "up-to-date" after update
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8002
ok 30 - checkout superproject with subproject already present
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8003
ok 31 - apply submodule diff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8004
ok 32 - update --init
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8005
ok 33 - do not add files from a submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8006
ok 34 - gracefully add submodule with a trailing slash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8007
ok 35 - ls-files gracefully handles trailing slash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8008
ok 36 - moving to a commit without submodule does not leave empty dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8009
ok 37 - submodule <invalid-path> warns
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8010
ok 38 - add submodules without specifying an explicit path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8011
ok 39 - add should fail when path is used by a file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8012
ok 40 - add should fail when path is used by an existing directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8013
ok 41 - use superproject as upstream when path is relative and no url is set there
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8014
ok 42 - set up for relative path tests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8015
ok 43 - relative path works with URL
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8016
ok 44 - relative path works with user@host:path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8017
# passed all 44 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8018
1..44
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8019
*** t7401-submodule-summary.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8020
ok 1 - added submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8021
ok 2 - modified submodule(forward)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8022
ok 3 - modified submodule(forward), --files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8023
ok 4 - modified submodule(backward)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8024
ok 5 - modified submodule(backward and forward)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8025
ok 6 - --summary-limit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8026
ok 7 - typechanged submodule(submodule->blob), --cached
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8027
ok 8 - typechanged submodule(submodule->blob), --files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8028
ok 9 - typechanged submodule(submodule->blob)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8029
ok 10 - nonexistent commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8030
ok 11 - typechanged submodule(blob->submodule)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8031
ok 12 - deleted submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8032
ok 13 - multiple submodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8033
ok 14 - path filter
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8034
ok 15 - given commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8035
ok 16 - --for-status
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8036
ok 17 - fail when using --files together with --cached
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8037
ok 18 - should not fail in an empty repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8038
# passed all 18 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8039
1..18
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8040
*** t7402-submodule-rebase.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8041
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8042
ok 2 - rebase with a dirty submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8043
ok 3 - interactive rebase with a dirty submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8044
ok 4 - rebase with dirty file and submodule fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8045
ok 5 - stash with a dirty submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8046
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8047
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8048
*** t7403-submodule-sync.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8049
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8050
ok 2 - change submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8051
ok 3 - change submodule url
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8052
ok 4 - "git submodule sync" should update submodule URLs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8053
ok 5 - "git submodule sync" should update known submodule URLs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8054
ok 6 - "git submodule sync" should not vivify uninteresting submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8055
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8056
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8057
*** t7405-submodule-merge.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8058
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8059
ok 2 - setup for merge search
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8060
ok 3 - merge with one side as a fast-forward of the other
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8061
ok 4 - merging should conflict for non fast-forward
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8062
ok 5 - merging should fail for ambiguous common parent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8063
ok 6 - merging should fail for changes that are backwards
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8064
ok 7 - git submodule status should display the merge conflict properly with merge base
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8065
ok 8 - git submodule status should display the merge conflict properly without merge-base
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8066
ok 9 - merging with a modify/modify conflict between merge bases
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8067
ok 10 - setup for recursive merge with submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8068
ok 11 - recursive merge with submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8069
# passed all 11 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8070
1..11
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8071
*** t7406-submodule-update.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8072
ok 1 - setup a submodule tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8073
ok 2 - submodule update detaching the HEAD 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8074
ok 3 - submodule update does not fetch already present commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8075
ok 4 - submodule update should fail due to local changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8076
ok 5 - submodule update should throw away changes with --force 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8077
ok 6 - submodule update --rebase staying on master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8078
ok 7 - submodule update --merge staying on master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8079
ok 8 - submodule update - rebase in .git/config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8080
ok 9 - submodule update - checkout in .git/config but --rebase given
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8081
ok 10 - submodule update - merge in .git/config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8082
ok 11 - submodule update - checkout in .git/config but --merge given
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8083
ok 12 - submodule update - checkout in .git/config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8084
ok 13 - submodule init picks up rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8085
ok 14 - submodule init picks up merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8086
ok 15 - submodule update --merge  - ignores --merge  for new submodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8087
ok 16 - submodule update --rebase - ignores --rebase for new submodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8088
ok 17 - submodule update ignores update=merge config for new submodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8089
ok 18 - submodule update ignores update=rebase config for new submodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8090
ok 19 - submodule init picks up update=none
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8091
ok 20 - submodule update - update=none in .git/config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8092
ok 21 - submodule update - update=none in .git/config but --checkout given
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8093
ok 22 - submodule update --init skips submodule with update=none
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8094
ok 23 - submodule update continues after checkout error
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8095
ok 24 - submodule update continues after recursive checkout error
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8096
ok 25 - submodule update exit immediately in case of merge conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8097
ok 26 - submodule update exit immediately after recursive rebase error
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8098
ok 27 - add different submodules to the same path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8099
ok 28 - submodule add places git-dir in superprojects git-dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8100
ok 29 - submodule update places git-dir in superprojects git-dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8101
ok 30 - submodule add places git-dir in superprojects git-dir recursive
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8102
ok 31 - submodule update places git-dir in superprojects git-dir recursive
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8103
not ok - 32 submodule add properly re-creates deeper level submodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8104
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8105
#		(cd super &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8106
#		 git reset --hard master &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8107
#		 rm -rf deeper/ &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8108
#		 git submodule add ../submodule deeper/submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8109
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8110
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8111
# failed 1 among 32 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8112
1..32
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8113
make[3]: [t7406-submodule-update.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8114
*** t7407-submodule-foreach.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8115
ok 1 - setup a submodule tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8116
ok 2 - test basic "submodule foreach" usage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8117
ok 3 - setup nested submodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8118
ok 4 - use "submodule foreach" to checkout 2nd level submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8119
ok 5 - use "foreach --recursive" to checkout all submodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8120
ok 6 - test messages from "foreach --recursive"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8121
ok 7 - test "foreach --quiet --recursive"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8122
ok 8 - use "update --recursive" to checkout all submodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8123
ok 9 - test "status --recursive"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8124
ok 10 - ensure "status --cached --recursive" preserves the --cached flag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8125
ok 11 - use "git clone --recursive" to checkout all submodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8126
ok 12 - test "update --recursive" with a flag with spaces
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8127
ok 13 - use "update --recursive nested1" to checkout all submodules rooted in nested1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8128
ok 14 - command passed to foreach retains notion of stdin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8129
ok 15 - command passed to foreach --recursive retains notion of stdin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8130
# passed all 15 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8131
1..15
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8132
*** t7408-submodule-reference.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8133
ok 1 - preparing first repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8134
ok 2 - preparing second repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8135
ok 3 - preparing supermodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8136
ok 4 - submodule add --reference
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8137
ok 5 - after add: existence of info/alternates
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8138
ok 6 - that reference gets used with add
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8139
ok 7 - cloning supermodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8140
ok 8 - update with reference
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8141
ok 9 - after update: existence of info/alternates
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8142
ok 10 - that reference gets used with update
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8143
# passed all 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8144
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8145
*** t7500-commit.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8146
ok 1 - a basic commit in an empty tree should succeed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8147
ok 2 - nonexistent template file should return error
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8148
ok 3 - nonexistent template file in config should return error
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8149
ok 4 - unedited template should not commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8150
ok 5 - unedited template with comments should not commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8151
ok 6 - a Signed-off-by line by itself should not commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8152
ok 7 - adding comments to a template should not commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8153
ok 8 - adding real content to a template should commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8154
ok 9 - -t option should be short for --template
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8155
ok 10 - config-specified template should commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8156
ok 11 - explicit commit message should override template
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8157
ok 12 - commit message from file should override template
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8158
ok 13 - commit message from template with whitespace issue
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8159
ok 14 - using alternate GIT_INDEX_FILE (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8160
ok 15 - using alternate GIT_INDEX_FILE (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8161
ok 16 - --signoff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8162
ok 17 - commit message from file (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8163
ok 18 - commit message from file (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8164
ok 19 - commit message from stdin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8165
ok 20 - commit -F overrides -t
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8166
ok 21 - Commit without message is allowed with --allow-empty-message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8167
ok 22 - Commit without message is no-no without --allow-empty-message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8168
ok 23 - Commit a message with --allow-empty-message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8169
ok 24 - commit --fixup provides correct one-line commit message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8170
ok 25 - commit --squash works with -F
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8171
ok 26 - commit --squash works with -m
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8172
ok 27 - commit --squash works with -C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8173
ok 28 - commit --squash works with -c
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8174
ok 29 - commit --squash works with -C for same commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8175
ok 30 - commit --squash works with -c for same commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8176
ok 31 - commit --squash works with editor
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8177
ok 32 - invalid message options when using --fixup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8178
# passed all 32 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8179
1..32
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8180
*** t7501-commit.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8181
ok 1 - initial status
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8182
ok 2 - fail initial amend
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8183
ok 3 - setup: initial commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8184
ok 4 - -m and -F do not mix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8185
ok 5 - -m and -C do not mix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8186
ok 6 - paths and -a do not mix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8187
ok 7 - can use paths with --interactive
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8188
ok 8 - using invalid commit with -C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8189
ok 9 - nothing to commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8190
ok 10 - setup: non-initial commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8191
ok 11 - commit message from non-existing file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8192
ok 12 - empty commit message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8193
ok 13 - setup: commit message from file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8194
ok 14 - amend commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8195
ok 15 - set up editor
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8196
ok 16 - amend without launching editor
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8197
ok 17 - --amend --edit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8198
ok 18 - -m --edit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8199
ok 19 - -m and -F do not mix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8200
ok 20 - using message from other commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8201
ok 21 - editing message from other commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8202
ok 22 - message from stdin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8203
ok 23 - overriding author from command line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8204
ok 24 - interactive add
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8205
ok 25 - commit --interactive doesn't change index if editor aborts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8206
ok 26 - editor not invoked if -F is given
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8207
ok 27 - partial commit that involves removal (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8208
ok 28 - partial commit that involves removal (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8209
ok 29 - partial commit that involves removal (3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8210
ok 30 - amend commit to fix author
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8211
ok 31 - amend commit to fix date
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8212
ok 32 - commit complains about bogus date
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8213
ok 33 - sign off (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8214
ok 34 - sign off (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8215
ok 35 - signoff gap
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8216
ok 36 - signoff gap 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8217
ok 37 - multiple -m
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8218
ok 38 - amend commit to fix author
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8219
ok 39 - git commit <file> with dirty index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8220
ok 40 - same tree (single parent)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8221
ok 41 - same tree (single parent) --allow-empty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8222
ok 42 - same tree (merge and amend merge)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8223
ok 43 - amend using the message from another commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8224
ok 44 - amend using the message from a commit named with tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8225
ok 45 - amend can copy notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8226
# passed all 45 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8227
1..45
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8228
*** t7502-commit.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8229
ok 1 - output summary format
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8230
ok 2 - output summary format: root-commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8231
ok 3 - output summary format for commit with an empty diff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8232
ok 4 - output summary format for merges
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8233
ok 5 - the basics
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8234
ok 6 - partial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8235
ok 7 - partial modification in a subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8236
ok 8 - partial removal
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8237
ok 9 - sign off
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8238
ok 10 - multiple -m
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8239
ok 11 - verbose
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8240
ok 12 - verbose respects diff config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8241
ok 13 - cleanup commit messages (verbatim,-t)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8242
ok 14 - cleanup commit messages (verbatim,-F)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8243
ok 15 - cleanup commit messages (verbatim,-m)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8244
ok 16 - cleanup commit messages (whitespace,-F)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8245
ok 17 - cleanup commit messages (strip,-F)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8246
ok 18 - cleanup commit messages (strip,-F,-e)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8247
ok 19 - cleanup commit messages (strip,-F,-e): output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8248
ok 20 - author different from committer
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8249
ok 21 - committer is automatic
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8250
ok 22 - do not fire editor in the presence of conflicts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8251
ok 23 - a SIGTERM should break locks
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8252
ok 24 - Hand committing of a redundant merge removes dups
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8253
ok 25 - A single-liner subject with a token plus colon is not a footer
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8254
ok 26 - commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8255
ok 27 - commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8256
ok 28 - commit --status
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8257
ok 29 - commit --no-status
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8258
ok 30 - commit with commit.status = yes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8259
ok 31 - commit with commit.status = no
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8260
ok 32 - commit --status with commit.status = yes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8261
ok 33 - commit --no-status with commit.status = yes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8262
ok 34 - commit --status with commit.status = no
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8263
ok 35 - commit --no-status with commit.status = no
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8264
ok 36 - commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8265
ok 37 - commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8266
ok 38 - commit --status
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8267
ok 39 - commit --no-status
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8268
ok 40 - commit with commit.status = yes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8269
ok 41 - commit with commit.status = no
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8270
ok 42 - commit --status with commit.status = yes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8271
ok 43 - commit --no-status with commit.status = yes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8272
ok 44 - commit --status with commit.status = no
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8273
ok 45 - commit --no-status with commit.status = no
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8274
# passed all 45 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8275
1..45
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8276
*** t7503-pre-commit-hook.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8277
ok 1 - with no hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8278
ok 2 - --no-verify with no hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8279
ok 3 - with succeeding hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8280
ok 4 - --no-verify with succeeding hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8281
ok 5 - with failing hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8282
ok 6 - --no-verify with failing hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8283
ok 7 - with non-executable hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8284
ok 8 - --no-verify with non-executable hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8285
ok 9 - with hook requiring GIT_PREFIX
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8286
ok 10 - with failing hook requiring GIT_PREFIX
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8287
# passed all 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8288
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8289
*** t7504-commit-msg-hook.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8290
ok 1 - with no hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8291
ok 2 - with no hook (editor)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8292
ok 3 - --no-verify with no hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8293
ok 4 - --no-verify with no hook (editor)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8294
ok 5 - with succeeding hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8295
ok 6 - with succeeding hook (editor)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8296
ok 7 - --no-verify with succeeding hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8297
ok 8 - --no-verify with succeeding hook (editor)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8298
ok 9 - with failing hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8299
ok 10 - with failing hook (editor)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8300
ok 11 - --no-verify with failing hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8301
ok 12 - --no-verify with failing hook (editor)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8302
ok 13 - with non-executable hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8303
ok 14 - with non-executable hook (editor)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8304
ok 15 - --no-verify with non-executable hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8305
ok 16 - --no-verify with non-executable hook (editor)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8306
ok 17 - hook edits commit message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8307
ok 18 - hook edits commit message (editor)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8308
ok 19 - hook doesn't edit commit message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8309
ok 20 - hook doesn't edit commit message (editor)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8310
# passed all 20 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8311
1..20
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8312
*** t7505-prepare-commit-msg-hook.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8313
ok 1 - with no hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8314
ok 2 - with hook (-m)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8315
ok 3 - with hook (-m editor)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8316
ok 4 - with hook (-t)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8317
ok 5 - with hook (-F)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8318
ok 6 - with hook (-F editor)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8319
ok 7 - with hook (-C)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8320
ok 8 - with hook (editor)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8321
ok 9 - with hook (--amend)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8322
ok 10 - with hook (-c)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8323
ok 11 - with hook (merge)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8324
ok 12 - with failing hook
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8325
ok 13 - with failing hook (--no-verify)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8326
# passed all 13 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8327
1..13
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8328
*** t7506-status-submodule.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8329
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8330
ok 2 - status clean
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8331
ok 3 - commit --dry-run -a clean
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8332
ok 4 - status with modified file in submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8333
ok 5 - status with modified file in submodule (porcelain)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8334
ok 6 - status with added file in submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8335
ok 7 - status with added file in submodule (porcelain)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8336
ok 8 - status with untracked file in submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8337
ok 9 - status -uno with untracked file in submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8338
ok 10 - status with untracked file in submodule (porcelain)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8339
ok 11 - status with added and untracked file in submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8340
ok 12 - status with added and untracked file in submodule (porcelain)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8341
ok 13 - status with modified file in modified submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8342
ok 14 - status with modified file in modified submodule (porcelain)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8343
ok 15 - status with added file in modified submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8344
ok 16 - status with added file in modified submodule (porcelain)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8345
ok 17 - status with untracked file in modified submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8346
ok 18 - status with untracked file in modified submodule (porcelain)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8347
ok 19 - status with added and untracked file in modified submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8348
ok 20 - status with added and untracked file in modified submodule (porcelain)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8349
ok 21 - setup .git file for sub
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8350
ok 22 - status with added file in modified submodule with .git file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8351
ok 23 - rm submodule contents
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8352
ok 24 - status clean (empty submodule dir)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8353
ok 25 - status -a clean (empty submodule dir)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8354
ok 26 - status with merge conflict in .gitmodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8355
ok 27 - diff with merge conflict in .gitmodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8356
ok 28 - diff --submodule with merge conflict in .gitmodules
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8357
# passed all 28 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8358
1..28
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8359
*** t7507-commit-verbose.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8360
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8361
ok 2 - initial commit shows verbose diff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8362
ok 3 - second commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8363
ok 4 - verbose diff is stripped out
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8364
ok 5 - verbose diff is stripped out (mnemonicprefix)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8365
ok 6 - diff in message is retained without -v
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8366
not ok 7 - diff in message is retained with -v # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8367
# still have 1 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8368
# passed all remaining 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8369
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8370
*** t7508-status.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8371
ok 1 - status -h in broken repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8372
ok 2 - commit -h in broken repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8373
ok 3 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8374
ok 4 - status (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8375
ok 5 - status (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8376
ok 6 - status (advice.statusHints false)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8377
ok 7 - status -s
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8378
ok 8 - status with gitignore
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8379
ok 9 - status with gitignore (nothing untracked)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8380
ok 10 - status -s -b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8381
ok 11 - setup dir3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8382
ok 12 - status -uno
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8383
ok 13 - status (status.showUntrackedFiles no)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8384
ok 14 - status -uno (advice.statusHints false)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8385
ok 15 - status -s -uno
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8386
ok 16 - status -s (status.showUntrackedFiles no)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8387
ok 17 - status -unormal
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8388
ok 18 - status (status.showUntrackedFiles normal)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8389
ok 19 - status -s -unormal
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8390
ok 20 - status -s (status.showUntrackedFiles normal)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8391
ok 21 - status -uall
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8392
ok 22 - status (status.showUntrackedFiles all)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8393
ok 23 - teardown dir3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8394
ok 24 - status -s -uall
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8395
ok 25 - status -s (status.showUntrackedFiles all)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8396
ok 26 - status with relative paths
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8397
ok 27 - status -s with relative paths
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8398
ok 28 - status --porcelain ignores relative paths setting
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8399
ok 29 - setup unique colors
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8400
ok 30 - status with color.ui
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8401
ok 31 - status with color.status
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8402
ok 32 - status -s with color.ui
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8403
ok 33 - status -s with color.status
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8404
ok 34 - status -s -b with color.status
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8405
ok 35 - status --porcelain ignores color.ui
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8406
ok 36 - status --porcelain ignores color.status
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8407
ok 37 - status --porcelain ignores -b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8408
ok 38 - status without relative paths
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8409
ok 39 - status -s without relative paths
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8410
ok 40 - dry-run of partial commit excluding new file in index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8411
ok 41 - status refreshes the index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8412
ok 42 - setup status submodule summary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8413
ok 43 - status submodule summary is disabled by default
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8414
ok 44 - status --untracked-files=all does not show submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8415
ok 45 - status -s submodule summary is disabled by default
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8416
ok 46 - status -s --untracked-files=all does not show submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8417
ok 47 - status submodule summary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8418
ok 48 - status -s submodule summary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8419
ok 49 - status submodule summary (clean submodule): commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8420
ok 50 - status -s submodule summary (clean submodule)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8421
ok 51 - status -z implies porcelain
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8422
ok 52 - commit --dry-run submodule summary (--amend)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8423
ok 53 - status succeeds in a read-only repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8424
ok 54 - --ignore-submodules=untracked suppresses submodules with untracked content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8425
ok 55 - .gitmodules ignore=untracked suppresses submodules with untracked content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8426
ok 56 - .git/config ignore=untracked suppresses submodules with untracked content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8427
ok 57 - --ignore-submodules=dirty suppresses submodules with untracked content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8428
ok 58 - .gitmodules ignore=dirty suppresses submodules with untracked content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8429
ok 59 - .git/config ignore=dirty suppresses submodules with untracked content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8430
ok 60 - --ignore-submodules=dirty suppresses submodules with modified content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8431
ok 61 - .gitmodules ignore=dirty suppresses submodules with modified content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8432
ok 62 - .git/config ignore=dirty suppresses submodules with modified content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8433
ok 63 - --ignore-submodules=untracked doesn't suppress submodules with modified content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8434
ok 64 - .gitmodules ignore=untracked doesn't suppress submodules with modified content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8435
ok 65 - .git/config ignore=untracked doesn't suppress submodules with modified content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8436
ok 66 - --ignore-submodules=untracked doesn't suppress submodule summary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8437
ok 67 - .gitmodules ignore=untracked doesn't suppress submodule summary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8438
ok 68 - .git/config ignore=untracked doesn't suppress submodule summary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8439
ok 69 - --ignore-submodules=dirty doesn't suppress submodule summary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8440
ok 70 - .gitmodules ignore=dirty doesn't suppress submodule summary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8441
ok 71 - .git/config ignore=dirty doesn't suppress submodule summary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8442
ok 72 - --ignore-submodules=all suppresses submodule summary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8443
not ok 73 - .gitmodules ignore=all suppresses submodule summary # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8444
not ok 74 - .git/config ignore=all suppresses submodule summary # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8445
# still have 2 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8446
# passed all remaining 72 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8447
1..74
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8448
*** t7509-commit.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8449
ok 1 - -C option copies authorship and message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8450
ok 2 - -C option copies only the message with --reset-author
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8451
ok 3 - -c option copies authorship and message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8452
ok 4 - -c option copies only the message with --reset-author
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8453
ok 5 - --amend option copies authorship
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8454
ok 6 - --amend option with empty author
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8455
ok 7 - --amend option with missing author
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8456
ok 8 - --reset-author makes the commit ours even with --amend option
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8457
ok 9 - --reset-author and --author are mutually exclusive
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8458
ok 10 - --reset-author should be rejected without -c/-C/--amend
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8459
ok 11 - commit respects CHERRY_PICK_HEAD and MERGE_MSG
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8460
ok 12 - --reset-author with CHERRY_PICK_HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8461
# passed all 12 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8462
1..12
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8463
*** t7510-signed-commit.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8464
You do not seem to have gpg installed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8465
ok 1 # skip create signed commits (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8466
ok 2 # skip show signatures (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8467
ok 3 # skip detect fudged signature (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8468
ok 4 # skip detect fudged signature with NUL (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8469
ok 5 # skip amending already signed commit (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8470
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8471
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8472
*** t7511-status-index.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8473
ok 1 - status, filename length 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8474
ok 2 - status, filename length 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8475
ok 3 - status, filename length 3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8476
ok 4 - status, filename length 4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8477
ok 5 - status, filename length 5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8478
ok 6 - status, filename length 6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8479
ok 7 - status, filename length 7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8480
ok 8 - status, filename length 8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8481
ok 9 - status, filename length 9
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8482
ok 10 - status, filename length 10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8483
ok 11 - status, filename length 11
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8484
ok 12 - status, filename length 12
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8485
ok 13 - status, filename length 13
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8486
ok 14 - status, filename length 14
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8487
ok 15 - status, filename length 15
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8488
ok 16 - status, filename length 16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8489
ok 17 - status, filename length 17
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8490
ok 18 - status, filename length 18
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8491
ok 19 - status, filename length 19
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8492
ok 20 - status, filename length 20
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8493
ok 21 - status, filename length 21
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8494
ok 22 - status, filename length 22
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8495
ok 23 - status, filename length 23
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8496
ok 24 - status, filename length 24
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8497
# passed all 24 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8498
1..24
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8499
*** t7600-merge.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8500
You do not seem to have gpg installed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8501
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8502
ok 2 - test option parsing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8503
ok 3 - merge -h with invalid index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8504
ok 4 - reject non-strategy with a git-merge-foo name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8505
ok 5 - merge c0 with c1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8506
ok 6 - merge c0 with c1 with --ff-only
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8507
ok 7 - merge from unborn branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8508
ok 8 - merge c1 with c2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8509
ok 9 - merge c1 with c2 and c3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8510
ok 10 - merges with --ff-only
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8511
ok 11 - merges with merge.ff=only
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8512
ok 12 - merge c0 with c1 (no-commit)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8513
ok 13 - merge c1 with c2 (no-commit)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8514
ok 14 - merge c1 with c2 and c3 (no-commit)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8515
ok 15 - merge c0 with c1 (squash)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8516
ok 16 - merge c0 with c1 (squash, ff-only)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8517
ok 17 - merge c1 with c2 (squash)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8518
ok 18 - unsuccesful merge of c1 with c2 (squash, ff-only)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8519
ok 19 - merge c1 with c2 and c3 (squash)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8520
ok 20 - merge c1 with c2 (no-commit in config)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8521
ok 21 - merge c1 with c2 (log in config)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8522
ok 22 - merge c1 with c2 (log in config gets overridden)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8523
ok 23 - merge c1 with c2 (squash in config)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8524
ok 24 - override config option -n with --summary
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8525
ok 25 - override config option -n with --stat
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8526
ok 26 - override config option --stat
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8527
ok 27 - merge c1 with c2 (override --no-commit)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8528
ok 28 - merge c1 with c2 (override --squash)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8529
ok 29 - merge c0 with c1 (no-ff)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8530
ok 30 - merge c0 with c1 (merge.ff=false)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8531
ok 31 - combine branch.master.mergeoptions with merge.ff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8532
ok 32 - tolerate unknown values for merge.ff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8533
ok 33 - combining --squash and --no-ff is refused
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8534
ok 34 - combining --ff-only and --no-ff is refused
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8535
ok 35 - merge c0 with c1 (ff overrides no-ff)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8536
ok 36 - merge log message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8537
ok 37 - merge c1 with c0, c2, c0, and c1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8538
ok 38 - merge c1 with c0, c2, c0, and c1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8539
ok 39 - merge c1 with c1 and c2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8540
ok 40 - merge fast-forward in a dirty tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8541
ok 41 - in-index merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8542
ok 42 - refresh the index before merging
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8543
ok 43 - merge early part of c2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8544
ok 44 - merge --no-ff --no-commit && commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8545
ok 45 - amending no-ff merge commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8546
ok 46 - merge --no-ff --edit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8547
ok 47 # skip merge --ff-only tag (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8548
ok 48 # skip merge --no-edit tag should skip editor (missing GPG)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8549
# passed all 48 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8550
1..48
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8551
*** t7601-merge-pull-config.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8552
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8553
ok 2 - merge c1 with c2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8554
ok 3 - merge c1 with c2 (ours in pull.twohead)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8555
ok 4 - merge c1 with c2 and c3 (recursive in pull.octopus)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8556
ok 5 - merge c1 with c2 and c3 (recursive and octopus in pull.octopus)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8557
ok 6 - setup conflicted merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8558
ok 7 - merge picks up the best result
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8559
ok 8 - merge picks up the best result (from config)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8560
ok 9 - merge errors out on invalid strategy
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8561
ok 10 - merge errors out on invalid strategy
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8562
# passed all 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8563
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8564
*** t7602-merge-octopus-many.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8565
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8566
ok 2 - merge c1 with c2, c3, c4, ... c29
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8567
ok 3 - merge output uses pretty names
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8568
ok 4 - merge up-to-date output uses pretty names
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8569
ok 5 - merge fast-forward output uses pretty names
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8570
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8571
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8572
*** t7603-merge-reduce-heads.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8573
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8574
ok 2 - merge c1 with c2, c3, c4, c5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8575
ok 3 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8576
ok 4 - merge E and I
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8577
ok 5 - verify merge result
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8578
ok 6 - add conflicts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8579
ok 7 - merge E2 and I2, causing a conflict and resolve it
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8580
ok 8 - verify merge result
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8581
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8582
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8583
*** t7604-merge-custom-message.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8584
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8585
ok 2 - merge c2 with a custom message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8586
ok 3 - merge --log appends to custom message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8587
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8588
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8589
*** t7605-merge-resolve.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8590
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8591
ok 2 - merge c1 to c2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8592
ok 3 - merge c2 to c3 (fails)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8593
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8594
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8595
*** t7606-merge-custom.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8596
ok 1 - set up custom strategy
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8597
ok 2 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8598
ok 3 - merge c2 with a custom strategy
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8599
ok 4 - trivial merge with custom strategy
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8600
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8601
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8602
*** t7607-merge-overwrite.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8603
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8604
ok 2 - will not overwrite untracked file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8605
ok 3 - will overwrite tracked file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8606
ok 4 - will not overwrite new file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8607
ok 5 - will not overwrite staged changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8608
ok 6 - will not overwrite removed file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8609
ok 7 - will not overwrite re-added file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8610
ok 8 - will not overwrite removed file with staged changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8611
ok 9 - will not overwrite untracked subtree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8612
ok 10 - will not overwrite untracked file in leading path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8613
ok 11 - will not overwrite untracked symlink in leading path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8614
ok 12 - will not be confused by symlink in leading path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8615
ok 13 - will not overwrite untracked file on unborn branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8616
ok 14 - will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8617
ok 15 - failed merge leaves unborn branch in the womb
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8618
ok 16 - set up unborn branch and content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8619
ok 17 - will not clobber WT/index when merging into unborn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8620
# passed all 17 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8621
1..17
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8622
*** t7608-merge-messages.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8623
ok 1 - merge local branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8624
ok 2 - merge octopus branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8625
ok 3 - merge tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8626
ok 4 - ambiguous tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8627
ok 5 - remote-tracking branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8628
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8629
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8630
*** t7609-merge-co-error-msgs.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8631
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8632
ok 2 - untracked files overwritten by merge (fast and non-fast forward)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8633
ok 3 - untracked files or local changes ovewritten by merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8634
ok 4 - cannot switch branches because of local changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8635
ok 5 - not uptodate file porcelain checkout error
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8636
ok 6 - not_uptodate_dir porcelain checkout error
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8637
# passed all 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8638
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8639
*** t7610-mergetool.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8640
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8641
ok 2 - custom mergetool
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8642
ok 3 - mergetool crlf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8643
ok 4 - mergetool in subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8644
ok 5 - mergetool on file in parent dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8645
ok 6 - mergetool skips autoresolved
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8646
ok 7 - mergetool merges all from subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8647
ok 8 - mergetool skips resolved paths when rerere is active
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8648
ok 9 - mergetool takes partial path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8649
ok 10 - deleted vs modified submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8650
ok 11 - file vs modified submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8651
ok 12 - submodule in subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8652
ok 13 - directory vs modified submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8653
ok 14 - file with no base
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8654
# passed all 14 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8655
1..14
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8656
*** t7611-merge-abort.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8657
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8658
ok 2 - fails without MERGE_HEAD (unstarted merge)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8659
ok 3 - fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8660
ok 4 - fails without MERGE_HEAD (completed merge)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8661
ok 5 - fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8662
ok 6 - Forget previous merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8663
ok 7 - Abort after --no-commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8664
ok 8 - Abort after conflicts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8665
ok 9 - Clean merge with dirty index fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8666
ok 10 - Conflicting merge with dirty index fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8667
ok 11 - Reset index (but preserve worktree changes)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8668
ok 12 - Abort clean merge with non-conflicting dirty worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8669
ok 13 - Abort conflicting merge with non-conflicting dirty worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8670
ok 14 - Reset worktree changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8671
ok 15 - Fail clean merge with conflicting dirty worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8672
ok 16 - Fail conflicting merge with conflicting dirty worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8673
ok 17 - Reset worktree changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8674
ok 18 - Fail clean merge with matching dirty worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8675
ok 19 - Abort clean merge with matching dirty index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8676
ok 20 - Reset worktree changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8677
ok 21 - Fail conflicting merge with matching dirty worktree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8678
ok 22 - Abort conflicting merge with matching dirty index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8679
ok 23 - Reset worktree changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8680
ok 24 - Abort merge with pre- and post-merge worktree changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8681
ok 25 - Reset worktree changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8682
ok 26 - Abort merge with pre- and post-merge index changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8683
# passed all 26 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8684
1..26
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8685
*** t7700-repack.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8686
ok 1 - objects in packs marked .keep are not repacked
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8687
ok 2 - loose objects in alternate ODB are not repacked
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8688
ok 3 - packed obs in alt ODB are repacked even when local repo is packless
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8689
ok 4 - packed obs in alt ODB are repacked when local repo has packs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8690
ok 5 - packed obs in alternate ODB kept pack are repacked
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8691
ok 6 - packed unreachable obs in alternate ODB are not loosened
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8692
ok 7 - local packed unreachable obs that exist in alternate ODB are not loosened
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8693
ok 8 - objects made unreachable by grafts only are kept
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8694
# passed all 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8695
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8696
*** t7701-repack-unpack-unreachable.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8697
ok 1 - -A with -d option leaves unreachable objects unpacked
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8698
ok 2 - -A without -d option leaves unreachable objects packed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8699
ok 3 - unpacked objects receive timestamp of pack file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8700
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8701
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8702
*** t7800-difftool.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8703
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8704
ok 2 - custom commands
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8705
ok 3 - difftool ignores bad --tool values
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8706
ok 4 - difftool honors --gui
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8707
ok 5 - difftool --gui works without configured diff.guitool
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8708
ok 6 - GIT_DIFF_TOOL variable
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8709
ok 7 - GIT_DIFF_TOOL overrides
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8710
ok 8 - GIT_DIFFTOOL_NO_PROMPT variable
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8711
ok 9 - GIT_DIFFTOOL_PROMPT variable
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8712
ok 10 - difftool.prompt config variable is false
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8713
ok 11 - difftool merge.prompt = false
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8714
ok 12 - difftool.prompt can overridden with -y
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8715
ok 13 - difftool.prompt can overridden with --prompt
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8716
ok 14 - difftool last flag wins
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8717
ok 15 - difftool + mergetool config variables
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8718
ok 16 - difftool.<tool>.path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8719
ok 17 - difftool --extcmd=cat
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8720
ok 18 - difftool --extcmd cat
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8721
ok 19 - difftool -x cat
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8722
ok 20 - difftool --extcmd echo arg1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8723
ok 21 - difftool --extcmd cat arg1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8724
ok 22 - difftool --extcmd cat arg2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8725
ok 23 - setup with 2 files different
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8726
ok 24 - say no to the first file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8727
ok 25 - say no to the second file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8728
# passed all 25 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8729
1..25
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8730
*** t7810-grep.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8731
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8732
ok 2 - grep should not segfault with a bad input
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8733
ok 3 - grep -w HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8734
ok 4 - grep -w HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8735
ok 5 - grep -w HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8736
ok 6 - grep -w HEAD (w)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8737
ok 7 - grep -w HEAD (x)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8738
ok 8 - grep -w HEAD (y-1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8739
ok 9 - grep -w HEAD (y-2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8740
ok 10 - grep -w HEAD (z)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8741
ok 11 - grep HEAD (t-1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8742
ok 12 - grep HEAD (t-2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8743
ok 13 - grep HEAD (t-3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8744
ok 14 - grep -c HEAD (no /dev/null)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8745
ok 15 - grep --max-depth -1 HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8746
ok 16 - grep --max-depth 0 HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8747
ok 17 - grep --max-depth 0 -- '*' HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8748
ok 18 - grep --max-depth 1 HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8749
ok 19 - grep --max-depth 0 -- t HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8750
ok 20 - grep --max-depth 0 -- . t HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8751
ok 21 - grep --max-depth 0 -- t . HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8752
ok 22 - grep HEAD with grep.extendedRegexp=false
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8753
ok 23 - grep HEAD with grep.extendedRegexp=true
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8754
ok 24 - grep -w in working tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8755
ok 25 - grep -w in working tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8756
ok 26 - grep -w in working tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8757
ok 27 - grep -w in working tree (w)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8758
ok 28 - grep -w in working tree (x)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8759
ok 29 - grep -w in working tree (y-1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8760
ok 30 - grep -w in working tree (y-2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8761
ok 31 - grep -w in working tree (z)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8762
ok 32 - grep in working tree (t-1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8763
ok 33 - grep in working tree (t-2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8764
ok 34 - grep in working tree (t-3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8765
ok 35 - grep -c in working tree (no /dev/null)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8766
ok 36 - grep --max-depth -1 in working tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8767
ok 37 - grep --max-depth 0 in working tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8768
ok 38 - grep --max-depth 0 -- '*' in working tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8769
ok 39 - grep --max-depth 1 in working tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8770
ok 40 - grep --max-depth 0 -- t in working tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8771
ok 41 - grep --max-depth 0 -- . t in working tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8772
ok 42 - grep --max-depth 0 -- t . in working tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8773
ok 43 - grep in working tree with grep.extendedRegexp=false
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8774
ok 44 - grep in working tree with grep.extendedRegexp=true
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8775
ok 45 - grep -l -C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8776
ok 46 - grep -l -C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8777
ok 47 - grep -L -C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8778
ok 48 - grep -e A --and -e B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8779
ok 49 - grep ( -e A --or -e B ) --and -e B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8780
ok 50 - grep -e A --and --not -e B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8781
ok 51 - grep should ignore GREP_OPTIONS
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8782
ok 52 - grep -f, non-existent file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8783
ok 53 - grep -f, one pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8784
ok 54 - grep -f, multiple patterns
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8785
ok 55 - grep -f, ignore empty lines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8786
ok 56 - grep -f, ignore empty lines, read patterns from stdin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8787
ok 57 - grep -q, silently report matches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8788
ok 58 - grep -C1, hunk mark between files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8789
ok 59 - grep -C1 hunk mark between files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8790
ok 60 - log grep setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8791
ok 61 - log grep (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8792
ok 62 - log grep (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8793
ok 63 - log grep (3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8794
ok 64 - log grep (4)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8795
ok 65 - log grep (5)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8796
ok 66 - log grep (6)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8797
ok 67 - log --grep --author implicitly uses all-match
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8798
ok 68 - log with multiple --author uses union
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8799
ok 69 - log with --grep and multiple --author uses all-match
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8800
ok 70 - log with --grep and multiple --author uses all-match
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8801
ok 71 - grep with CE_VALID file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8802
ok 72 - grep -p with userdiff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8803
ok 73 - grep -p
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8804
ok 74 - grep -p -B5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8805
ok 75 - grep -W
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8806
ok 76 - grep -W with userdiff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8807
ok 77 - grep from a subdirectory to search wider area (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8808
ok 78 - grep from a subdirectory to search wider area (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8809
ok 79 - grep -Fi
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8810
ok 80 - outside of git repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8811
ok 81 - inside git repository but with --no-index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8812
ok 82 - setup double-dash tests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8813
ok 83 - grep -- pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8814
ok 84 - grep -- pattern -- pathspec
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8815
ok 85 - grep -e pattern -- path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8816
ok 86 - grep -e -- -- path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8817
ok 87 # skip grep --perl-regexp pattern (missing LIBPCRE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8818
ok 88 # skip grep -P pattern (missing LIBPCRE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8819
ok 89 - grep pattern with grep.extendedRegexp=true
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8820
ok 90 # skip grep -P pattern with grep.extendedRegexp=true (missing LIBPCRE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8821
ok 91 # skip grep -P -v pattern (missing LIBPCRE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8822
ok 92 # skip grep -P -i pattern (missing LIBPCRE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8823
ok 93 # skip grep -P -w pattern (missing LIBPCRE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8824
ok 94 - grep -G invalidpattern properly dies 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8825
ok 95 - grep -E invalidpattern properly dies 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8826
ok 96 # skip grep -P invalidpattern properly dies  (missing LIBPCRE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8827
ok 97 - grep -G -E -F pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8828
ok 98 - grep -E -F -G pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8829
ok 99 - grep -F -G -E pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8830
ok 100 - grep -G -F -P -E pattern
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8831
ok 101 # skip grep -G -F -E -P pattern (missing LIBPCRE)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8832
ok 102 - grep --color, separator
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8833
ok 103 - grep --break
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8834
ok 104 - grep --break with context
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8835
ok 105 - grep --heading
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8836
ok 106 - mimic ack-grep --group
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8837
# passed all 106 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8838
1..106
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8839
*** t7811-grep-open.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8840
ok 1 - determine default pager
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8841
ok 2 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8842
ok 3 - git grep -O
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8843
ok 4 - git grep -O --cached
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8844
ok 5 - git grep -O --no-index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8845
ok 6 - setup: fake "less"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8846
ok 7 - git grep -O jumps to line in less
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8847
ok 8 - modified file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8848
ok 9 - copes with color settings
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8849
ok 10 - run from subdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8850
# passed all 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8851
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8852
*** t8001-annotate.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8853
ok 1 - prepare reference tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8854
ok 2 - check all lines blamed on A
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8855
ok 3 - Setup new lines blamed on B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8856
ok 4 - Two lines blamed on A, two on B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8857
ok 5 - merge-setup part 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8858
ok 6 - Two lines blamed on A, two on B, two on B1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8859
ok 7 - merge-setup part 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8860
ok 8 - Two lines blamed on A, one on B, one on B2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8861
ok 9 - merge-setup part 3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8862
ok 10 - Two lines blamed on A, one on B, two on B1, one on B2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8863
ok 11 - Annotating an old revision works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8864
ok 12 - Annotating an old revision works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8865
ok 13 - merge-setup part 4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8866
ok 14 - Two lines blamed on A, one on B, two on B1, one on B2, one on A U Thor
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8867
ok 15 - an incomplete line added
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8868
ok 16 - With incomplete lines.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8869
ok 17 - some edit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8870
ok 18 - some edit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8871
ok 19 - an obfuscated email added
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8872
ok 20 - obfuscated email parsed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8873
ok 21 - Annotating an old revision works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8874
# passed all 21 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8875
1..21
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8876
*** t8002-blame.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8877
ok 1 - prepare reference tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8878
ok 2 - check all lines blamed on A
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8879
ok 3 - Setup new lines blamed on B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8880
ok 4 - Two lines blamed on A, two on B
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8881
ok 5 - merge-setup part 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8882
ok 6 - Two lines blamed on A, two on B, two on B1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8883
ok 7 - merge-setup part 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8884
ok 8 - Two lines blamed on A, one on B, one on B2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8885
ok 9 - merge-setup part 3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8886
ok 10 - Two lines blamed on A, one on B, two on B1, one on B2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8887
ok 11 - Annotating an old revision works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8888
ok 12 - Annotating an old revision works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8889
ok 13 - merge-setup part 4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8890
ok 14 - Two lines blamed on A, one on B, two on B1, one on B2, one on A U Thor
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8891
ok 15 - an incomplete line added
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8892
ok 16 - With incomplete lines.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8893
ok 17 - some edit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8894
ok 18 - some edit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8895
ok 19 - an obfuscated email added
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8896
ok 20 - obfuscated email parsed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8897
ok 21 - Blame --show-email works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8898
# passed all 21 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8899
1..21
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8900
*** t8003-blame-corner-cases.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8901
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8902
ok 2 - straight copy without -C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8903
ok 3 - straight move without -C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8904
ok 4 - straight copy with -C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8905
ok 5 - straight move with -C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8906
ok 6 - straight copy with -C -C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8907
ok 7 - straight move with -C -C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8908
ok 8 - append without -C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8909
ok 9 - append with -C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8910
ok 10 - append with -C -C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8911
ok 11 - append with -C -C -C
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8912
ok 12 - blame wholesale copy
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8913
ok 13 - blame wholesale copy and more
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8914
ok 14 - blame path that used to be a directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8915
ok 15 - blame to a commit with no author name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8916
ok 16 - blame -L with invalid start
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8917
ok 17 - blame -L with invalid end
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8918
ok 18 - indent of line numbers, nine lines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8919
ok 19 - indent of line numbers, ten lines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8920
# passed all 19 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8921
1..19
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8922
*** t8004-blame-with-conflicts.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8923
ok 1 - setup first case
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8924
ok 2 - blame runs on unconflicted file while other file has conflicts
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8925
ok 3 - blame runs on conflicted file in stages 1,3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8926
# passed all 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8927
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8928
*** t8005-blame-i18n.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8929
ok 1 - setup the repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8930
ok 2 - blame respects i18n.commitencoding
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8931
ok 3 - blame respects i18n.logoutputencoding
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8932
ok 4 - blame respects --encoding=UTF-8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8933
ok 5 - blame respects --encoding=none
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8934
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8935
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8936
*** t8006-blame-textconv.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8937
ok 1 - setup 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8938
ok 2 - no filter specified
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8939
ok 3 - setup textconv filters
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8940
ok 4 - blame with --no-textconv
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8941
ok 5 - basic blame on last commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8942
ok 6 - blame --textconv going through revisions
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8943
ok 7 - blame --textconv with local changes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8944
ok 8 - setup +cachetextconv
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8945
ok 9 - blame --textconv works with textconvcache
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8946
ok 10 - setup -cachetextconv
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8947
ok 11 - make a new commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8948
ok 12 - blame from previous revision
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8949
ok 13 - blame with --no-textconv (on symlink)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8950
ok 14 - blame --textconv (on symlink)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8951
ok 15 - make another new commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8952
ok 16 - blame on last commit (-C -C, symlink)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8953
# passed all 16 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8954
1..16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8955
*** t8007-cat-file-textconv.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8956
ok 1 - setup 
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8957
ok 2 - no filter specified
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8958
ok 3 - setup textconv filters
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8959
ok 4 - cat-file without --textconv
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8960
ok 5 - cat-file without --textconv on previous commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8961
ok 6 - cat-file --textconv on last commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8962
ok 7 - cat-file --textconv on previous commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8963
ok 8 - cat-file without --textconv (symlink)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8964
ok 9 - cat-file --textconv on index (symlink)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8965
ok 10 - cat-file --textconv on HEAD (symlink)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8966
# passed all 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8967
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8968
*** t8008-blame-formats.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8969
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8970
ok 2 - normal blame output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8971
ok 3 - blame --porcelain output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8972
ok 4 - blame --line-porcelain output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8973
# passed all 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8974
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8975
*** t9001-send-email.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8976
ok 1 - prepare reference tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8977
ok 2 - Setup helper tool
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8978
ok 3 - Extract patches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8979
ok 4 - No confirm with --suppress-cc
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8980
ok 5 - No confirm with --confirm=never
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8981
ok 6 - No confirm with sendemail.confirm=never
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8982
ok 7 - Send patches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8983
ok 8 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8984
ok 9 - Verify commandline
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8985
ok 10 - Send patches with --envelope-sender
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8986
ok 11 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8987
ok 12 - Verify commandline
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8988
ok 13 - Send patches with --envelope-sender=auto
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8989
ok 14 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8990
ok 15 - Verify commandline
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8991
ok 16 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8992
ok 17 - Show all headers
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8993
ok 18 - Prompting works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8994
ok 19 - tocmd works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8995
ok 20 - cccmd works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8996
ok 21 - reject long lines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8997
ok 22 - no patch was sent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8998
ok 23 - Author From: in message body
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  8999
ok 24 - Author From: not in message body
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9000
ok 25 - allow long lines with --no-validate
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9001
ok 26 - Invalid In-Reply-To
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9002
ok 27 - Valid In-Reply-To when prompting
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9003
ok 28 - In-Reply-To without --chain-reply-to
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9004
ok 29 - In-Reply-To with --chain-reply-to
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9005
ok 30 - setup fake editor
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9006
ok 31 - --compose works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9007
ok 32 - first message is compose text
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9008
ok 33 - second message is patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9009
ok 34 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9010
ok 35 - sendemail.cc set
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9011
ok 36 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9012
ok 37 - sendemail.cc unset
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9013
ok 38 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9014
ok 39 - sendemail.cccmd
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9015
ok 40 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9016
ok 41 - --suppress-cc=all
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9017
ok 42 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9018
ok 43 - --suppress-cc=body
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9019
ok 44 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9020
ok 45 - --suppress-cc=body --suppress-cc=cccmd
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9021
ok 46 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9022
ok 47 - --suppress-cc=sob
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9023
ok 48 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9024
ok 49 - --suppress-cc=bodycc
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9025
ok 50 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9026
ok 51 - --suppress-cc=cc
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9027
ok 52 - --confirm=always
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9028
ok 53 - --confirm=auto
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9029
ok 54 - --confirm=cc
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9030
ok 55 - --confirm=compose
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9031
ok 56 - confirm by default (due to cc)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9032
ok 57 - confirm by default (due to --compose)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9033
ok 58 - confirm detects EOF (inform assumes y)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9034
ok 59 - confirm detects EOF (auto causes failure)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9035
ok 60 - confirm doesnt loop forever
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9036
ok 61 - utf8 Cc is rfc2047 encoded
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9037
ok 62 - --compose adds MIME for utf8 body
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9038
ok 63 - --compose respects user mime type
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9039
ok 64 - --compose adds MIME for utf8 subject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9040
ok 65 - detects ambiguous reference/file conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9041
ok 66 - feed two files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9042
ok 67 - in-reply-to but no threading
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9043
ok 68 - no in-reply-to and no threading
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9044
ok 69 - threading but no chain-reply-to
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9045
ok 70 - warning with an implicit --chain-reply-to
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9046
ok 71 - no warning with an explicit --chain-reply-to
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9047
ok 72 - no warning with an explicit --no-chain-reply-to
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9048
ok 73 - no warning with sendemail.chainreplyto = false
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9049
ok 74 - no warning with sendemail.chainreplyto = true
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9050
ok 75 - sendemail.to works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9051
ok 76 - --no-to overrides sendemail.to
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9052
ok 77 - sendemail.cc works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9053
ok 78 - --no-cc overrides sendemail.cc
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9054
ok 79 - sendemail.bcc works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9055
ok 80 - --no-bcc overrides sendemail.bcc
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9056
ok 81 - patches To headers are used by default
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9057
ok 82 - patches To headers are appended to
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9058
ok 83 - To headers from files reset each patch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9059
ok 84 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9060
ok 85 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9061
ok 86 - asks about and fixes 8bit encodings
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9062
ok 87 - sendemail.8bitEncoding works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9063
ok 88 - --8bit-encoding overrides sendemail.8bitEncoding
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9064
ok 89 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9065
ok 90 - setup expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9066
ok 91 - --8bit-encoding also treats subject
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9067
ok 92 - refusing to send cover letter template
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9068
ok 93 - --force sends cover letter template anyway
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9069
ok 94 - sendemail.aliasfiletype=mailrc
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9070
ok 95 - sendemail.aliasfile=~/.mailrc
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9071
# passed all 95 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9072
1..95
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9073
*** t9010-svn-fe.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9074
ok 1 - empty dump
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9075
ok 2 - v4 dumps not supported
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9076
not ok 3 - empty revision # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9077
ok 4 - empty properties
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9078
ok 5 - author name and commit message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9079
ok 6 - unsupported properties are ignored
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9080
not ok 7 - timestamp and empty file # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9081
ok 8 - directory with files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9082
ok 9 - node without action
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9083
ok 10 - action: add node without text
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9084
not ok 11 - change file mode but keep old content # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9085
ok 12 - NUL in property value
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9086
ok 13 - NUL in log message, file content, and property name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9087
ok 14 - change file mode and reiterate content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9088
ok 15 - deltas not supported
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9089
ok 16 - property deltas supported
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9090
ok 17 - properties on /
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9091
ok 18 - deltas for typechange
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9092
ok 19 - set up svn repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9093
ok 20 - t9135/svn.dump
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9094
# still have 3 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9095
# passed all remaining 17 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9096
1..20
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9097
*** t9100-git-svn-basic.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9098
define NO_SVN_TESTS to skip git svn tests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9099
# UTF-8 locale not set, some tests skipped (C)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9100
ok 1 - initialize git svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9101
not ok - 2 import an SVN revision into git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9102
#	git svn fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9103
ok 3 - checkout from svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9104
not ok - 4 try a deep --rmdir with a commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9105
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9106
#		git checkout -f -b mybranch ${remotes_git_svn} &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9107
#		mv dir/a/b/c/d/e/file dir/file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9108
#		cp dir/file file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9109
#		git update-index --add --remove dir/a/b/c/d/e/file dir/file file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9110
#		git commit -m "$name" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9111
#		git svn set-tree --find-copies-harder --rmdir \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9112
#			${remotes_git_svn}..mybranch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9113
#		svn_cmd up "$SVN_TREE" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9114
#		test -d "$SVN_TREE"/dir && test ! -d "$SVN_TREE"/dir/a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9115
not ok - 5 detect node change from file to directory #1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9116
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9117
#		mkdir dir/new_file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9118
#		mv dir/file dir/new_file/file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9119
#		mv dir/new_file dir/file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9120
#		git update-index --remove dir/file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9121
#		git update-index --add dir/file/file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9122
#		git commit -m 'detect node change from file to directory #1' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9123
#		test_must_fail git svn set-tree --find-copies-harder --rmdir 		remotes/git-svn..mybranch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9124
not ok - 6 detect node change from directory to file #1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9125
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9126
#		rm -rf dir "$GIT_DIR"/index &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9127
#		git checkout -f -b mybranch2 ${remotes_git_svn} &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9128
#		mv bar/zzz zzz &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9129
#		rm -rf bar &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9130
#		mv zzz bar &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9131
#		git update-index --remove -- bar/zzz &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9132
#		git update-index --add -- bar &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9133
#		git commit -m "$name" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9134
#		test_must_fail git svn set-tree --find-copies-harder --rmdir \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9135
#			${remotes_git_svn}..mybranch2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9136
not ok - 7 detect node change from file to directory #2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9137
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9138
#		rm -f "$GIT_DIR"/index &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9139
#		git checkout -f -b mybranch3 ${remotes_git_svn} &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9140
#		rm bar/zzz &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9141
#		git update-index --remove bar/zzz &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9142
#		mkdir bar/zzz &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9143
#		echo yyy > bar/zzz/yyy &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9144
#		git update-index --add bar/zzz/yyy &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9145
#		git commit -m "$name" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9146
#		test_must_fail git svn set-tree --find-copies-harder --rmdir \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9147
#			${remotes_git_svn}..mybranch3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9148
not ok - 8 detect node change from directory to file #2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9149
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9150
#		rm -f "$GIT_DIR"/index &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9151
#		git checkout -f -b mybranch4 ${remotes_git_svn} &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9152
#		rm -rf dir &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9153
#		git update-index --remove -- dir/file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9154
#		touch dir &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9155
#		echo asdf > dir &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9156
#		git update-index --add -- dir &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9157
#		git commit -m "$name" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9158
#		test_must_fail git svn set-tree --find-copies-harder --rmdir \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9159
#			${remotes_git_svn}..mybranch4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9160
not ok - 9 remove executable bit from a file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9161
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9162
#		rm -f "$GIT_DIR"/index &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9163
#		git checkout -f -b mybranch5 ${remotes_git_svn} &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9164
#		chmod -x exec.sh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9165
#		git update-index exec.sh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9166
#		git commit -m "$name" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9167
#		git svn set-tree --find-copies-harder --rmdir \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9168
#			${remotes_git_svn}..mybranch5 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9169
#		svn_cmd up "$SVN_TREE" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9170
#		test ! -x "$SVN_TREE"/exec.sh
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9171
not ok - 10 add executable bit back file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9172
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9173
#		chmod +x exec.sh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9174
#		git update-index exec.sh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9175
#		git commit -m "$name" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9176
#		git svn set-tree --find-copies-harder --rmdir \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9177
#			${remotes_git_svn}..mybranch5 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9178
#		svn_cmd up "$SVN_TREE" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9179
#		test -x "$SVN_TREE"/exec.sh
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9180
not ok - 11 executable file becomes a symlink to bar/zzz (file)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9181
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9182
#		rm exec.sh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9183
#		ln -s bar/zzz exec.sh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9184
#		git update-index exec.sh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9185
#		git commit -m "$name" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9186
#		git svn set-tree --find-copies-harder --rmdir \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9187
#			${remotes_git_svn}..mybranch5 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9188
#		svn_cmd up "$SVN_TREE" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9189
#		test -h "$SVN_TREE"/exec.sh
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9190
not ok - 12 new symlink is added to a file that was also just made executable
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9191
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9192
#		chmod +x bar/zzz &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9193
#		ln -s bar/zzz exec-2.sh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9194
#		git update-index --add bar/zzz exec-2.sh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9195
#		git commit -m "$name" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9196
#		git svn set-tree --find-copies-harder --rmdir \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9197
#			${remotes_git_svn}..mybranch5 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9198
#		svn_cmd up "$SVN_TREE" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9199
#		test -x "$SVN_TREE"/bar/zzz &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9200
#		test -h "$SVN_TREE"/exec-2.sh
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9201
not ok - 13 modify a symlink to become a file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9202
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9203
#		echo git help > help || true &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9204
#		rm exec-2.sh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9205
#		cp help exec-2.sh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9206
#		git update-index exec-2.sh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9207
#		git commit -m "$name" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9208
#		git svn set-tree --find-copies-harder --rmdir \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9209
#			${remotes_git_svn}..mybranch5 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9210
#		svn_cmd up "$SVN_TREE" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9211
#		test -f "$SVN_TREE"/exec-2.sh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9212
#		test ! -h "$SVN_TREE"/exec-2.sh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9213
#		test_cmp help "$SVN_TREE"/exec-2.sh
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9214
ok 14 # skip commit with UTF-8 message: locale: C (missing UTF8)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9215
not ok - 15 test fetch functionality (svn => git) with alternate GIT_SVN_ID
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9216
#	git svn init "$svnrepo" && git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9217
#	     git rev-list --pretty=raw ${remotes_git_svn} | grep ^tree | uniq > a &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9218
#	     git rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9219
#	     test_cmp a b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9220
not ok - 16 check imported tree checksums expected tree checksums
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9221
#	test_cmp a expected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9222
ok 17 - exit if remote refs are ambigious
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9223
ok 18 - exit if init-ing a would clobber a URL
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9224
not ok - 19 init allows us to connect to another directory in the same repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9225
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9226
#	        git svn init --minimize-url -i bar "$svnrepo/bar" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9227
#	        git config --get svn-remote.svn.fetch \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9228
#	                              "^bar:refs/remotes/bar$" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9229
#	        git config --get svn-remote.svn.fetch \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9230
#	                              "^:refs/${remotes_git_svn}$"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9231
#	        
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9232
not ok - 20 dcommit $rev does not clobber current branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9233
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9234
#		git svn fetch -i bar &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9235
#		git checkout -b my-bar refs/remotes/bar &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9236
#		echo 1 > foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9237
#		git add foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9238
#		git commit -m "change 1" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9239
#		echo 2 > foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9240
#		git add foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9241
#		git commit -m "change 2" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9242
#		old_head=$(git rev-parse HEAD) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9243
#		git svn dcommit -i bar HEAD^ &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9244
#		test $old_head = $(git rev-parse HEAD) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9245
#		test refs/heads/my-bar = $(git symbolic-ref HEAD) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9246
#		git log refs/remotes/bar | grep "change 1" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9247
#		! git log refs/remotes/bar | grep "change 2" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9248
#		git checkout master &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9249
#		git branch -D my-bar
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9250
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9251
not ok - 21 able to dcommit to a subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9252
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9253
#		git svn fetch -i bar &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9254
#		git checkout -b my-bar refs/remotes/bar &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9255
#		echo abc > d &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9256
#		git update-index --add d &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9257
#		git commit -m '/bar/d should be in the log' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9258
#		git svn dcommit -i bar &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9259
#		test -z "`git diff refs/heads/my-bar refs/remotes/bar`" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9260
#		mkdir newdir &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9261
#		echo new > newdir/dir &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9262
#		git update-index --add newdir/dir &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9263
#		git commit -m 'add a new directory' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9264
#		git svn dcommit -i bar &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9265
#		test -z "`git diff refs/heads/my-bar refs/remotes/bar`" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9266
#		echo foo >> newdir/dir &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9267
#		git update-index newdir/dir &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9268
#		git commit -m 'modify a file in new directory' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9269
#		git svn dcommit -i bar &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9270
#		test -z "`git diff refs/heads/my-bar refs/remotes/bar`"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9271
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9272
not ok - 22 dcommit should not fail with a touched file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9273
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9274
#		test_commit "commit-new-file-foo2" foo2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9275
#		test-chmtime =-60 foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9276
#		git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9277
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9278
not ok - 23 rebase should not fail with a touched file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9279
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9280
#		test-chmtime =-60 foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9281
#		git svn rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9282
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9283
not ok - 24 able to set-tree to a subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9284
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9285
#		echo cba > d &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9286
#		git update-index d &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9287
#		git commit -m 'update /bar/d' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9288
#		git svn set-tree -i bar HEAD &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9289
#		test -z "`git diff refs/heads/my-bar refs/remotes/bar`"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9290
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9291
not ok - 25 git-svn works in a bare repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9292
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9293
#		mkdir bare-repo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9294
#		( cd bare-repo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9295
#		git init --bare &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9296
#		GIT_DIR=. git svn init "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9297
#		git svn fetch ) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9298
#		rm -rf bare-repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9299
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9300
# failed 20 among 25 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9301
1..25
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9302
make[3]: [t9100-git-svn-basic.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9303
*** t9101-git-svn-props.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9304
ok 1 - checkout working copy from svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9305
ok 2 - setup some commits to svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9306
ok 3 - initialize git svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9307
not ok - 4 fetch revisions from svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9308
#	git svn fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9309
not ok - 5 test svn:keywords ignoring
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9310
#	git checkout -b mybranch ${remotes_git_svn} &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9311
#		echo Hi again >> kw.c &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9312
#		git commit -a -m "test keywords ignoring" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9313
#		git svn set-tree ${remotes_git_svn}..mybranch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9314
#		git pull . ${remotes_git_svn}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9315
sed: Cannot open file kw.c.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9316
not ok - 6 raw $Id$ found in kw.c
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9317
#	test '/* $Id$ */' = ''
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9318
ok 7 - propset CR on crlf files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9319
not ok - 8 fetch and pull latest from svn and checkout a new wc
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9320
#	git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9321
#		 git pull . ${remotes_git_svn} &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9322
#		 svn_cmd co "$svnrepo" new_wc
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9323
not ok - 9 Comparing crlf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9324
#	cmp crlf new_wc/crlf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9325
not ok - 10 Comparing ne_crlf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9326
#	cmp ne_crlf new_wc/ne_crlf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9327
not ok - 11 Comparing lf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9328
#	cmp lf new_wc/lf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9329
not ok - 12 Comparing ne_lf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9330
#	cmp ne_lf new_wc/ne_lf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9331
not ok - 13 Comparing cr
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9332
#	cmp cr new_wc/cr
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9333
not ok - 14 Comparing ne_cr
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9334
#	cmp ne_cr new_wc/ne_cr
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9335
not ok - 15 Comparing empty_cr
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9336
#	cmp empty_cr new_wc/empty_cr
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9337
not ok - 16 Comparing empty_lf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9338
#	cmp empty_lf new_wc/empty_lf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9339
not ok - 17 Comparing empty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9340
#	cmp empty new_wc/empty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9341
not ok - 18 Comparing empty_crlf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9342
#	cmp empty_crlf new_wc/empty_crlf
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9343
ok 19 - Set CRLF on cr files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9344
not ok - 20 fetch and pull latest from svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9345
#	git svn fetch && git pull . ${remotes_git_svn}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9346
fatal: Cannot open 'cr': No such file or directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9347
fatal: Cannot open 'ne_cr': No such file or directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9348
not ok - 21 CRLF + $Id$
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9349
#	test 'f39bd49beefa1dff130e47c7a24777dfc3657ba2' = ''
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9350
not ok - 22 CRLF + $Id$ (no newline)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9351
#	test '41c5e77993f143876592cd19b5e9a6f6d2e4ff8a' = ''
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9352
not ok - 23 test show-ignore
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9353
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9354
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9355
#			cd test_wc &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9356
#			mkdir -p deeply/nested/directory &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9357
#			touch deeply/nested/directory/.keep &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9358
#			svn_cmd add deeply &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9359
#			svn_cmd up &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9360
#			svn_cmd propset -R svn:ignore '
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9361
#	no-such-file*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9362
#	' .
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9363
#			svn_cmd commit -m 'propset svn:ignore'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9364
#		) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9365
#		git svn show-ignore > show-ignore.got &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9366
#		cmp show-ignore.expect show-ignore.got
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9367
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9368
not ok - 24 test create-ignore
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9369
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9370
#		git svn fetch && git pull . remotes/git-svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9371
#		git svn create-ignore &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9372
#		cmp ./.gitignore create-ignore.expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9373
#		cmp ./deeply/.gitignore create-ignore.expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9374
#		cmp ./deeply/nested/.gitignore create-ignore.expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9375
#		cmp ./deeply/nested/directory/.gitignore create-ignore.expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9376
#		git ls-files -s | grep gitignore | cmp - create-ignore-index.expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9377
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9378
not ok - 25 test propget
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9379
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9380
#		git svn propget svn:ignore . | cmp - prop.expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9381
#		cd deeply &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9382
#		git svn propget svn:ignore . | cmp - ../prop.expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9383
#		git svn propget svn:entry:committed-rev nested/directory/.keep 	  | cmp - ../prop2.expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9384
#		git svn propget svn:ignore .. | cmp - ../prop.expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9385
#		git svn propget svn:ignore nested/ | cmp - ../prop.expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9386
#		git svn propget svn:ignore ./nested | cmp - ../prop.expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9387
#		git svn propget svn:ignore .././deeply/nested | cmp - ../prop.expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9388
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9389
not ok - 26 test proplist
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9390
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9391
#		git svn proplist . | cmp - prop.expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9392
#		git svn proplist nested/directory/.keep | cmp - prop2.expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9393
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9394
# failed 21 among 26 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9395
1..26
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9396
make[3]: [t9101-git-svn-props.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9397
*** t9102-git-svn-deep-rmdir.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9398
ok 1 - initialize repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9399
not ok - 2 mirror via git svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9400
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9401
#		git svn init "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9402
#		git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9403
#		git checkout -f -b test-rmdir ${remotes_git_svn}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9404
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9405
not ok - 3 Try a commit on rmdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9406
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9407
#		git rm -f deeply/nested/directory/number/2/another &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9408
#		git commit -a -m "remove another" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9409
#		git svn set-tree --rmdir HEAD &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9410
#		svn_cmd ls -R "$svnrepo" | grep ^deeply/nested/directory/number/1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9411
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9412
# failed 2 among 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9413
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9414
make[3]: [t9102-git-svn-deep-rmdir.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9415
*** t9103-git-svn-tracked-directory-removed.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9416
ok 1 - make history for tracking
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9417
not ok - 2 clone repo with git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9418
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9419
#		git svn clone -s "$svnrepo" x &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9420
#		test -f x/FOLLOWME &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9421
#		test ! -f x/README
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9422
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9423
not ok - 3 make sure r2 still has old file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9424
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9425
#		cd x &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9426
#			test -n "$(git svn find-rev r1)" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9427
#			git reset --hard $(git svn find-rev r1) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9428
#			test -f README &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9429
#			test ! -f FOLLOWME &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9430
#			test x$(git svn find-rev r2) = x
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9431
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9432
# failed 2 among 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9433
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9434
make[3]: [t9103-git-svn-tracked-directory-removed.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9435
*** t9104-git-svn-follow-parent.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9436
ok 1 - initialize repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9437
not ok - 2 init and fetch a moved directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9438
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9439
#		git svn init --minimize-url -i thunk "$svnrepo"/thunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9440
#		git svn fetch -i thunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9441
#		test "`git rev-parse --verify refs/remotes/thunk@2`" \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9442
#	           = "`git rev-parse --verify refs/remotes/thunk~1`" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9443
#	        test "`git cat-file blob refs/remotes/thunk:readme |\
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9444
#	                 sed -n -e "3p"`" = goodbye &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9445
#		test -z "`git config --get svn-remote.svn.fetch \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9446
#		         "^trunk:refs/remotes/thunk@2$"`"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9447
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9448
not ok - 3 init and fetch from one svn-remote
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9449
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9450
#	        git config svn-remote.svn.url "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9451
#	        git config --add svn-remote.svn.fetch \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9452
#	          trunk:refs/remotes/svn/trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9453
#	        git config --add svn-remote.svn.fetch \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9454
#	          thunk:refs/remotes/svn/thunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9455
#	        git svn fetch -i svn/thunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9456
#		test "`git rev-parse --verify refs/remotes/svn/trunk`" \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9457
#	           = "`git rev-parse --verify refs/remotes/svn/thunk~1`" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9458
#	        test "`git cat-file blob refs/remotes/svn/thunk:readme |\
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9459
#	                 sed -n -e "3p"`" = goodbye
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9460
#	        
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9461
not ok - 4 follow deleted parent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9462
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9463
#	        (svn_cmd cp -m "resurrecting trunk as junk" \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9464
#	               "$svnrepo"/trunk@2 "$svnrepo"/junk ||
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9465
#	         svn cp -m "resurrecting trunk as junk" \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9466
#	               -r2 "$svnrepo"/trunk "$svnrepo"/junk) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9467
#	        git config --add svn-remote.svn.fetch \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9468
#	          junk:refs/remotes/svn/junk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9469
#	        git svn fetch -i svn/thunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9470
#	        git svn fetch -i svn/junk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9471
#	        test -z "`git diff svn/junk svn/trunk`" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9472
#	        test "`git merge-base svn/junk svn/trunk`" \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9473
#	           = "`git rev-parse svn/trunk`"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9474
#	        
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9475
ok 5 - follow larger parent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9476
not ok - 6 follow higher-level parent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9477
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9478
#		svn mkdir -m "follow higher-level parent" "$svnrepo"/blob &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9479
#		svn co "$svnrepo"/blob blob &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9480
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9481
#			cd blob &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9482
#			echo hi > hi &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9483
#			svn add hi &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9484
#			svn commit -m "hihi"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9485
#		) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9486
#		svn mkdir -m "new glob at top level" "$svnrepo"/glob &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9487
#		svn mv -m "move blob down a level" "$svnrepo"/blob "$svnrepo"/glob/blob &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9488
#		git svn init --minimize-url -i blob "$svnrepo"/glob/blob &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9489
#	        git svn fetch -i blob
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9490
#	        
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9491
not ok - 7 follow deleted directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9492
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9493
#		svn_cmd mv -m "bye!" "$svnrepo"/glob/blob/hi "$svnrepo"/glob/blob/bye &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9494
#		svn_cmd rm -m "remove glob" "$svnrepo"/glob &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9495
#		git svn init --minimize-url -i glob "$svnrepo"/glob &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9496
#		git svn fetch -i glob &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9497
#		test "`git cat-file blob refs/remotes/glob:blob/bye`" = hi &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9498
#		test "`git ls-tree refs/remotes/glob | wc -l `" -eq 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9499
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9500
not ok - 8 follow-parent avoids deleting relevant info
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9501
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9502
#		mkdir -p import/trunk/subversion/bindings/swig/perl/t &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9503
#		for i in a b c ; do \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9504
#		  echo $i > import/trunk/subversion/bindings/swig/perl/$i.pm &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9505
#		  echo _$i > import/trunk/subversion/bindings/swig/perl/t/$i.t; \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9506
#		done &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9507
#		  echo "bad delete test" > \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9508
#		   import/trunk/subversion/bindings/swig/perl/t/larger-parent &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9509
#		  echo "bad delete test 2" > \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9510
#		   import/trunk/subversion/bindings/swig/perl/another-larger &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9511
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9512
#			cd import &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9513
#			svn import -m "r9270 test" . "$svnrepo"/r9270
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9514
#		) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9515
#		svn_cmd co "$svnrepo"/r9270/trunk/subversion/bindings/swig/perl r9270 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9516
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9517
#			cd r9270 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9518
#			svn mkdir native &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9519
#			svn mv t native/t &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9520
#			for i in a b c
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9521
#			do
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9522
#				svn mv $i.pm native/$i.pm
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9523
#			done &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9524
#			echo z >>native/t/c.t &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9525
#			poke native/t/c.t &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9526
#			svn commit -m "reorg test"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9527
#		) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9528
#		git svn init --minimize-url -i r9270-t \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9529
#		  "$svnrepo"/r9270/trunk/subversion/bindings/swig/perl/native/t &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9530
#		git svn fetch -i r9270-t &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9531
#		test `git rev-list r9270-t | wc -l` -eq 2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9532
#		test "`git ls-tree --name-only r9270-t~1`" = \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9533
#		     "`git ls-tree --name-only r9270-t`"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9534
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9535
not ok - 9 track initial change if it was only made to parent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9536
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9537
#		svn_cmd cp -m "wheee!" "$svnrepo"/r9270/trunk "$svnrepo"/r9270/drunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9538
#		git svn init --minimize-url -i r9270-d \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9539
#		  "$svnrepo"/r9270/drunk/subversion/bindings/swig/perl/native/t &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9540
#		git svn fetch -i r9270-d &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9541
#		test `git rev-list r9270-d | wc -l` -eq 3 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9542
#		test "`git ls-tree --name-only r9270-t`" = \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9543
#		     "`git ls-tree --name-only r9270-d`" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9544
#		test "`git rev-parse r9270-t`" = \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9545
#		     "`git rev-parse r9270-d~1`"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9546
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9547
not ok - 10 follow-parent is atomic
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9548
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9549
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9550
#			cd wc &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9551
#			svn_cmd up &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9552
#			svn_cmd mkdir stunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9553
#			echo "trunk stunk" > stunk/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9554
#			svn_cmd add stunk/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9555
#			svn_cmd ci -m "trunk stunk" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9556
#			echo "stunk like junk" >> stunk/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9557
#			svn_cmd ci -m "really stunk" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9558
#			echo "stink stank stunk" >> stunk/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9559
#			svn_cmd ci -m "even the grinch agrees"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9560
#		) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9561
#		svn_cmd copy -m "stunk flunked" "$svnrepo"/stunk "$svnrepo"/flunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9562
#		{ svn cp -m "early stunk flunked too" \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9563
#			"$svnrepo"/stunk@17 "$svnrepo"/flunked ||
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9564
#		svn_cmd cp -m "early stunk flunked too" \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9565
#			-r17 "$svnrepo"/stunk "$svnrepo"/flunked; } &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9566
#		git svn init --minimize-url -i stunk "$svnrepo"/stunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9567
#		git svn fetch -i stunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9568
#		git update-ref refs/remotes/flunk@18 refs/remotes/stunk~2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9569
#		git update-ref -d refs/remotes/stunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9570
#		git config --unset svn-remote.svn.fetch stunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9571
#		mkdir -p "$GIT_DIR"/svn/refs/remotes/flunk@18 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9572
#		rev_map=$(cd "$GIT_DIR"/svn/refs/remotes/stunk && ls .rev_map*) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9573
#		dd if="$GIT_DIR"/svn/refs/remotes/stunk/$rev_map \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9574
#		   of="$GIT_DIR"/svn/refs/remotes/flunk@18/$rev_map bs=24 count=1 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9575
#		rm -rf "$GIT_DIR"/svn/refs/remotes/stunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9576
#		git svn init --minimize-url -i flunk "$svnrepo"/flunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9577
#		git svn fetch -i flunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9578
#		git svn init --minimize-url -i stunk "$svnrepo"/stunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9579
#		git svn fetch -i stunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9580
#		git svn init --minimize-url -i flunked "$svnrepo"/flunked &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9581
#		git svn fetch -i flunked &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9582
#		test "`git rev-parse --verify refs/remotes/flunk@18`" \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9583
#		   = "`git rev-parse --verify refs/remotes/stunk`" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9584
#		test "`git rev-parse --verify refs/remotes/flunk~1`" \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9585
#		   = "`git rev-parse --verify refs/remotes/stunk`" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9586
#		test "`git rev-parse --verify refs/remotes/flunked~1`" \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9587
#		   = "`git rev-parse --verify refs/remotes/stunk~1`"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9588
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9589
not ok - 11 track multi-parent paths
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9590
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9591
#		svn_cmd cp -m "resurrect /glob" "$svnrepo"/r9270 "$svnrepo"/glob &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9592
#		git svn multi-fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9593
#		test `git cat-file commit refs/remotes/glob | \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9594
#		       grep "^parent " | wc -l` -eq 2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9595
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9596
not ok - 12 multi-fetch continues to work
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9597
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9598
#		git svn multi-fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9599
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9600
not ok - 13 multi-fetch works off a 'clean' repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9601
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9602
#		rm -r "$GIT_DIR/svn" "$GIT_DIR/refs/remotes" "$GIT_DIR/logs" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9603
#		mkdir "$GIT_DIR/svn" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9604
#		git svn multi-fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9605
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9606
# failed 11 among 13 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9607
1..13
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9608
make[3]: [t9104-git-svn-follow-parent.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9609
*** t9105-git-svn-commit-diff.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9610
ok 1 - initialize repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9611
not ok - 2 test the commit-diff command
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9612
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9613
#		test -n "$prev" && test -n "$head" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9614
#		git svn commit-diff -r1 "$prev" "$head" "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9615
#		svn_cmd co "$svnrepo" wc &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9616
#		cmp readme wc/readme
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9617
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9618
not ok - 3 commit-diff to a sub-directory (with git svn config)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9619
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9620
#		svn_cmd import -m "sub-directory" import "$svnrepo"/subdir &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9621
#		git svn init --minimize-url "$svnrepo"/subdir &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9622
#		git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9623
#		git svn commit-diff -r3 "$prev" "$head" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9624
#		svn_cmd cat "$svnrepo"/subdir/readme > readme.2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9625
#		cmp readme readme.2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9626
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9627
# failed 2 among 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9628
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9629
make[3]: [t9105-git-svn-commit-diff.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9630
*** t9106-git-svn-commit-diff-clobber.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9631
ok 1 - initialize repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9632
ok 2 - commit change from svn side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9633
not ok - 3 commit conflicting change from git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9634
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9635
#		echo second line from git >> file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9636
#		git commit -a -m "second line from git" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9637
#		test_must_fail git svn commit-diff -r1 HEAD~1 HEAD "$svnrepo"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9638
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9639
not ok - 4 commit complementing change from git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9640
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9641
#		git reset --hard HEAD~1 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9642
#		echo second line from svn >> file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9643
#		git commit -a -m "second line from svn" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9644
#		echo third line from git >> file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9645
#		git commit -a -m "third line from git" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9646
#		git svn commit-diff -r2 HEAD~1 HEAD "$svnrepo"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9647
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9648
not ok - 5 dcommit fails to commit because of conflict
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9649
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9650
#		git svn init "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9651
#		git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9652
#		git reset --hard refs/${remotes_git_svn} &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9653
#		svn_cmd co "$svnrepo" t.svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9654
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9655
#			cd t.svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9656
#			echo fourth line from svn >>file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9657
#			poke file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9658
#			svn_cmd commit -m "fourth line from svn"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9659
#		) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9660
#		rm -rf t.svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9661
#		echo "fourth line from git" >> file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9662
#		git commit -a -m "fourth line from git" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9663
#		test_must_fail git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9664
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9665
not ok - 6 dcommit does the svn equivalent of an index merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9666
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9667
#		git reset --hard refs/remotes/git-svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9668
#		echo 'index merge' > file2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9669
#		git update-index --add file2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9670
#		git commit -a -m 'index merge' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9671
#		echo 'more changes' >> file2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9672
#		git update-index file2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9673
#		git commit -a -m 'more changes' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9674
#		git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9675
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9676
ok 7 - commit another change from svn side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9677
not ok - 8 multiple dcommit from git svn will not clobber svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9678
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9679
#		git reset --hard refs/remotes/git-svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9680
#		echo new file >> new-file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9681
#		git update-index --add new-file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9682
#		git commit -a -m 'new file' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9683
#		echo clobber > file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9684
#		git commit -a -m 'clobber' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9685
#		test_must_fail git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9686
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9687
not ok - 9 check that rebase really failed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9688
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9689
#		test -d .git/rebase-apply
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9690
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9691
not ok - 10 resolve, continue the rebase and dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9692
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9693
#		echo clobber and I really mean it > file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9694
#		git update-index file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9695
#		git rebase --continue &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9696
#		git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9697
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9698
# failed 7 among 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9699
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9700
make[3]: [t9106-git-svn-commit-diff-clobber.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9701
*** t9107-git-svn-migrate.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9702
not ok - 1 setup old-looking metadata
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9703
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9704
#		cp "$GIT_DIR"/config "$GIT_DIR"/config-old-git-svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9705
#		mkdir import &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9706
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9707
#			cd import &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9708
#			for i in trunk branches/a branches/b tags/0.1 tags/0.2 tags/0.3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9709
#			do
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9710
#				mkdir -p $i &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9711
#				echo hello >>$i/README ||
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9712
#				exit 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9713
#			done &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9714
#			svn_cmd import -m test . "$svnrepo"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9715
#		) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9716
#		git svn init "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9717
#		git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9718
#		rm -rf "$GIT_DIR"/svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9719
#		git update-ref refs/heads/git-svn-HEAD refs/${remotes_git_svn} &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9720
#		git update-ref refs/heads/svn-HEAD refs/${remotes_git_svn} &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9721
#		git update-ref -d refs/${remotes_git_svn} refs/${remotes_git_svn}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9722
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9723
fatal: Needed a single revision
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9724
not ok - 2 git-svn-HEAD is a real HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9725
#	test -n ''
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9726
not ok - 3 initialize old-style (v0) git svn layout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9727
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9728
#		mkdir -p "$GIT_DIR"/git-svn/info "$GIT_DIR"/svn/info &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9729
#		echo "$svnrepo" > "$GIT_DIR"/git-svn/info/url &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9730
#		echo "$svnrepo" > "$GIT_DIR"/svn/info/url &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9731
#		git svn migrate &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9732
#		! test -d "$GIT_DIR"/git svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9733
#		git rev-parse --verify refs/${remotes_git_svn}^0 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9734
#		git rev-parse --verify refs/remotes/svn^0 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9735
#		test "$(git config --get svn-remote.svn.url)" = "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9736
#		test `git config --get svn-remote.svn.fetch` = \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9737
#	             ":refs/${remotes_git_svn}"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9738
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9739
not ok - 4 initialize a multi-repository repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9740
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9741
#		git svn init "$svnrepo" -T trunk -t tags -b branches &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9742
#		git config --get-all svn-remote.svn.fetch > fetch.out &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9743
#		grep "^trunk:refs/remotes/trunk$" fetch.out &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9744
#		test -n "`git config --get svn-remote.svn.branches \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9745
#		            "^branches/\*:refs/remotes/\*$"`" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9746
#		test -n "`git config --get svn-remote.svn.tags \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9747
#		            "^tags/\*:refs/remotes/tags/\*$"`" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9748
#		git config --unset svn-remote.svn.branches \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9749
#		                        "^branches/\*:refs/remotes/\*$" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9750
#		git config --unset svn-remote.svn.tags \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9751
#		                        "^tags/\*:refs/remotes/tags/\*$" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9752
#		git config --add svn-remote.svn.fetch "branches/a:refs/remotes/a" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9753
#		git config --add svn-remote.svn.fetch "branches/b:refs/remotes/b" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9754
#		for i in tags/0.1 tags/0.2 tags/0.3; do
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9755
#			git config --add svn-remote.svn.fetch \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9756
#			                 $i:refs/remotes/$i || exit 1; done &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9757
#		git config --get-all svn-remote.svn.fetch > fetch.out &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9758
#		grep "^trunk:refs/remotes/trunk$" fetch.out &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9759
#		grep "^branches/a:refs/remotes/a$" fetch.out &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9760
#		grep "^branches/b:refs/remotes/b$" fetch.out &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9761
#		grep "^tags/0\.1:refs/remotes/tags/0\.1$" fetch.out &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9762
#		grep "^tags/0\.2:refs/remotes/tags/0\.2$" fetch.out &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9763
#		grep "^tags/0\.3:refs/remotes/tags/0\.3$" fetch.out &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9764
#		grep "^:refs/${remotes_git_svn}" fetch.out
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9765
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9766
not ok - 5 multi-fetch works on partial urls + paths
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9767
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9768
#		git svn multi-fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9769
#		for i in trunk a b tags/0.1 tags/0.2 tags/0.3; do
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9770
#			git rev-parse --verify refs/remotes/$i^0 >> refs.out || exit 1;
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9771
#		    done &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9772
#		test -z "`sort < refs.out | uniq -d`" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9773
#		for i in trunk a b tags/0.1 tags/0.2 tags/0.3; do
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9774
#		  for j in trunk a b tags/0.1 tags/0.2 tags/0.3; do
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9775
#			if test $j != $i; then continue; fi
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9776
#		    test -z "`git diff refs/remotes/$i 	                         refs/remotes/$j`" ||exit 1; done; done
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9777
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9778
not ok - 6 migrate --minimize on old inited layout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9779
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9780
#		git config --unset-all svn-remote.svn.fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9781
#		git config --unset-all svn-remote.svn.url &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9782
#		rm -rf "$GIT_DIR"/svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9783
#		for i in `cat fetch.out`; do
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9784
#			path=`expr $i : "\([^:]*\):.*$"`
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9785
#			ref=`expr $i : "[^:]*:\(refs/remotes/.*\)$"`
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9786
#			if test -z "$ref"; then continue; fi
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9787
#			if test -n "$path"; then path="/$path"; fi
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9788
#			( mkdir -p "$GIT_DIR"/svn/$ref/info/ &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9789
#			echo "$svnrepo"$path > "$GIT_DIR"/svn/$ref/info/url ) || exit 1;
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9790
#		done &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9791
#		git svn migrate --minimize &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9792
#		test -z "`git config -l | grep "^svn-remote\.git-svn\."`" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9793
#		git config --get-all svn-remote.svn.fetch > fetch.out &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9794
#		grep "^trunk:refs/remotes/trunk$" fetch.out &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9795
#		grep "^branches/a:refs/remotes/a$" fetch.out &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9796
#		grep "^branches/b:refs/remotes/b$" fetch.out &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9797
#		grep "^tags/0\.1:refs/remotes/tags/0\.1$" fetch.out &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9798
#		grep "^tags/0\.2:refs/remotes/tags/0\.2$" fetch.out &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9799
#		grep "^tags/0\.3:refs/remotes/tags/0\.3$" fetch.out &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9800
#		grep "^:refs/${remotes_git_svn}" fetch.out
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9801
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9802
not ok - 7 .rev_db auto-converted to .rev_map.UUID
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9803
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9804
#		git svn fetch -i trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9805
#		test -z "$(ls "$GIT_DIR"/svn/refs/remotes/trunk/.rev_db.* 2>/dev/null)" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9806
#		expect="$(ls "$GIT_DIR"/svn/refs/remotes/trunk/.rev_map.*)" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9807
#		test -n "$expect" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9808
#		rev_db="$(echo $expect | sed -e "s,_map,_db,")" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9809
#		convert_to_rev_db "$expect" "$rev_db" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9810
#		rm -f "$expect" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9811
#		test -f "$rev_db" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9812
#		git svn fetch -i trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9813
#		test -z "$(ls "$GIT_DIR"/svn/refs/remotes/trunk/.rev_db.* 2>/dev/null)" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9814
#		test ! -e "$GIT_DIR"/svn/refs/remotes/trunk/.rev_db &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9815
#		test -f "$expect"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9816
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9817
# failed 7 among 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9818
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9819
make[3]: [t9107-git-svn-migrate.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9820
*** t9108-git-svn-glob.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9821
not ok - 1 test refspec globbing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9822
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9823
#		mkdir -p trunk/src/a trunk/src/b trunk/doc &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9824
#		echo "hello world" > trunk/src/a/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9825
#		echo "goodbye world" > trunk/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9826
#		svn_cmd import -m "initial" trunk "$svnrepo"/trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9827
#		svn_cmd co "$svnrepo" tmp &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9828
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9829
#			cd tmp &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9830
#			mkdir branches tags &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9831
#			svn_cmd add branches tags &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9832
#			svn_cmd cp trunk branches/start &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9833
#			svn_cmd commit -m "start a new branch" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9834
#			svn_cmd up &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9835
#			echo "hi" >> branches/start/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9836
#			poke branches/start/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9837
#			echo "hey" >> branches/start/src/a/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9838
#			poke branches/start/src/a/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9839
#			svn_cmd commit -m "hi" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9840
#			svn_cmd up &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9841
#			svn_cmd cp branches/start tags/end &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9842
#			echo "bye" >> tags/end/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9843
#			poke tags/end/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9844
#			echo "aye" >> tags/end/src/a/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9845
#			poke tags/end/src/a/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9846
#			svn_cmd commit -m "the end" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9847
#			echo "byebye" >> tags/end/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9848
#			poke tags/end/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9849
#			svn_cmd commit -m "nothing to see here"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9850
#		) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9851
#		git config --add svn-remote.svn.url "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9852
#		git config --add svn-remote.svn.fetch \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9853
#		                 "trunk/src/a:refs/remotes/trunk" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9854
#		git config --add svn-remote.svn.branches \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9855
#		                 "branches/*/src/a:refs/remotes/branches/*" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9856
#		git config --add svn-remote.svn.tags\
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9857
#		                 "tags/*/src/a:refs/remotes/tags/*" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9858
#		git svn multi-fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9859
#		git log --pretty=oneline refs/remotes/tags/end | \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9860
#		    sed -e "s/^.\{41\}//" > output.end &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9861
#		test_cmp expect.end output.end &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9862
#		test "`git rev-parse refs/remotes/tags/end~1`" = \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9863
#			"`git rev-parse refs/remotes/branches/start`" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9864
#		test "`git rev-parse refs/remotes/branches/start~2`" = \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9865
#			"`git rev-parse refs/remotes/trunk`" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9866
#		test_must_fail git rev-parse refs/remotes/tags/end@3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9867
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9868
not ok - 2 test left-hand-side only globbing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9869
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9870
#		git config --add svn-remote.two.url "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9871
#		git config --add svn-remote.two.fetch trunk:refs/remotes/two/trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9872
#		git config --add svn-remote.two.branches \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9873
#		                 "branches/*:refs/remotes/two/branches/*" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9874
#		git config --add svn-remote.two.tags \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9875
#		                 "tags/*:refs/remotes/two/tags/*" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9876
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9877
#			cd tmp &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9878
#			echo "try try" >> tags/end/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9879
#			poke tags/end/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9880
#			svn_cmd commit -m "try to try"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9881
#		) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9882
#		git svn fetch two &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9883
#		test `git rev-list refs/remotes/two/tags/end | wc -l` -eq 6 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9884
#		test `git rev-list refs/remotes/two/branches/start | wc -l` -eq 3 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9885
#		test `git rev-parse refs/remotes/two/branches/start~2` = \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9886
#		     `git rev-parse refs/remotes/two/trunk` &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9887
#		test `git rev-parse refs/remotes/two/tags/end~3` = \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9888
#		     `git rev-parse refs/remotes/two/branches/start` &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9889
#		git log --pretty=oneline refs/remotes/two/tags/end | \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9890
#		    sed -e "s/^.\{41\}//" > output.two &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9891
#		test_cmp expect.two output.two
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9892
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9893
ok 3 - test disallow multi-globs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9894
# failed 2 among 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9895
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9896
make[3]: [t9108-git-svn-glob.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9897
*** t9109-git-svn-multi-glob.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9898
not ok - 1 test refspec globbing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9899
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9900
#		mkdir -p trunk/src/a trunk/src/b trunk/doc &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9901
#		echo "hello world" > trunk/src/a/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9902
#		echo "goodbye world" > trunk/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9903
#		svn_cmd import -m "initial" trunk "$svnrepo"/trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9904
#		svn_cmd co "$svnrepo" tmp &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9905
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9906
#			cd tmp &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9907
#			mkdir branches branches/v1 tags &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9908
#			svn_cmd add branches tags &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9909
#			svn_cmd cp trunk branches/v1/start &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9910
#			svn_cmd commit -m "start a new branch" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9911
#			svn_cmd up &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9912
#			echo "hi" >> branches/v1/start/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9913
#			poke branches/v1/start/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9914
#			echo "hey" >> branches/v1/start/src/a/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9915
#			poke branches/v1/start/src/a/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9916
#			svn_cmd commit -m "hi" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9917
#			svn_cmd up &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9918
#			svn_cmd cp branches/v1/start tags/end &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9919
#			echo "bye" >> tags/end/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9920
#			poke tags/end/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9921
#			echo "aye" >> tags/end/src/a/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9922
#			poke tags/end/src/a/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9923
#			svn_cmd commit -m "the end" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9924
#			echo "byebye" >> tags/end/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9925
#			poke tags/end/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9926
#			svn_cmd commit -m "nothing to see here"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9927
#		) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9928
#		git config --add svn-remote.svn.url "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9929
#		git config --add svn-remote.svn.fetch \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9930
#		                 "trunk/src/a:refs/remotes/trunk" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9931
#		git config --add svn-remote.svn.branches \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9932
#		                 "branches/*/*/src/a:refs/remotes/branches/*/*" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9933
#		git config --add svn-remote.svn.tags\
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9934
#		                 "tags/*/src/a:refs/remotes/tags/*" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9935
#		git svn multi-fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9936
#		git log --pretty=oneline refs/remotes/tags/end | \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9937
#		    sed -e "s/^.\{41\}//" > output.end &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9938
#		test_cmp expect.end output.end &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9939
#		test "`git rev-parse refs/remotes/tags/end~1`" = \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9940
#			"`git rev-parse refs/remotes/branches/v1/start`" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9941
#		test "`git rev-parse refs/remotes/branches/v1/start~2`" = \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9942
#			"`git rev-parse refs/remotes/trunk`" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9943
#		test_must_fail git rev-parse refs/remotes/tags/end@3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9944
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9945
not ok - 2 test left-hand-side only globbing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9946
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9947
#		git config --add svn-remote.two.url "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9948
#		git config --add svn-remote.two.fetch trunk:refs/remotes/two/trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9949
#		git config --add svn-remote.two.branches \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9950
#		                 "branches/*/*:refs/remotes/two/branches/*/*" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9951
#		git config --add svn-remote.two.tags \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9952
#		                 "tags/*:refs/remotes/two/tags/*" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9953
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9954
#			cd tmp &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9955
#			echo "try try" >> tags/end/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9956
#			poke tags/end/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9957
#			svn_cmd commit -m "try to try"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9958
#		) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9959
#		git svn fetch two &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9960
#		test `git rev-list refs/remotes/two/tags/end | wc -l` -eq 6 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9961
#		test `git rev-list refs/remotes/two/branches/v1/start | wc -l` -eq 3 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9962
#		test `git rev-parse refs/remotes/two/branches/v1/start~2` = \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9963
#		     `git rev-parse refs/remotes/two/trunk` &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9964
#		test `git rev-parse refs/remotes/two/tags/end~3` = \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9965
#		     `git rev-parse refs/remotes/two/branches/v1/start` &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9966
#		git log --pretty=oneline refs/remotes/two/tags/end | \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9967
#		    sed -e "s/^.\{41\}//" > output.two &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9968
#		test_cmp expect.two output.two
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9969
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9970
not ok - 3 test another branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9971
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9972
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9973
#			cd tmp &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9974
#			mkdir branches/v2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9975
#			svn_cmd add branches/v2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9976
#			svn_cmd cp trunk branches/v2/start &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9977
#			svn_cmd commit -m "Another versioned branch" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9978
#			svn_cmd up &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9979
#			echo "hello" >> branches/v2/start/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9980
#			poke branches/v2/start/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9981
#			echo "howdy" >> branches/v2/start/src/a/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9982
#			poke branches/v2/start/src/a/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9983
#			svn_cmd commit -m "Changed 2 in v2/start" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9984
#			svn_cmd up &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9985
#			svn_cmd cp branches/v2/start tags/next &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9986
#			echo "bye" >> tags/next/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9987
#			poke tags/next/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9988
#			echo "aye" >> tags/next/src/a/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9989
#			poke tags/next/src/a/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9990
#			svn_cmd commit -m "adding more" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9991
#			echo "byebye" >> tags/next/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9992
#			poke tags/next/src/b/readme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9993
#			svn_cmd commit -m "adios"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9994
#		) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9995
#		git config --add svn-remote.four.url "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9996
#		git config --add svn-remote.four.fetch trunk:refs/remotes/four/trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9997
#		git config --add svn-remote.four.branches \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9998
#		                 "branches/*/*:refs/remotes/four/branches/*/*" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
  9999
#		git config --add svn-remote.four.tags \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10000
#		                 "tags/*:refs/remotes/four/tags/*" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10001
#		git svn fetch four &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10002
#		test `git rev-list refs/remotes/four/tags/next | wc -l` -eq 5 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10003
#		test `git rev-list refs/remotes/four/branches/v2/start | wc -l` -eq 3 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10004
#		test `git rev-parse refs/remotes/four/branches/v2/start~2` = \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10005
#		     `git rev-parse refs/remotes/four/trunk` &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10006
#		test `git rev-parse refs/remotes/four/tags/next~2` = \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10007
#		     `git rev-parse refs/remotes/four/branches/v2/start` &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10008
#		git log --pretty=oneline refs/remotes/four/tags/next | \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10009
#		    sed -e "s/^.\{41\}//" > output.four &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10010
#		test_cmp expect.four output.four
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10011
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10012
ok 4 - test disallow multiple globs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10013
# failed 3 among 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10014
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10015
make[3]: [t9109-git-svn-multi-glob.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10016
*** t9110-git-svn-use-svm-props.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10017
not ok - 1 load svm repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10018
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10019
#		svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9110/svm.dump &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10020
#		git svn init --minimize-url -R arr -i bar "$svnrepo"/mirror/arr &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10021
#		git svn init --minimize-url -R argh -i dir "$svnrepo"/mirror/argh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10022
#		git svn init --minimize-url -R argh -i e \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10023
#		  "$svnrepo"/mirror/argh/a/b/c/d/e &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10024
#		git config svn.useSvmProps true &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10025
#		git svn fetch --all
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10026
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10027
not ok - 2 verify metadata for /bar
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10028
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10029
#		git cat-file commit refs/remotes/bar | 	   grep '^git-svn-id: http://mayonaise/svnrepo/bar@12 161ce429-a9dd-4828-af4a-52023f968c89$' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10030
#		git cat-file commit refs/remotes/bar~1 | 	   grep '^git-svn-id: http://mayonaise/svnrepo/bar@11 161ce429-a9dd-4828-af4a-52023f968c89$' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10031
#		git cat-file commit refs/remotes/bar~2 | 	   grep '^git-svn-id: http://mayonaise/svnrepo/bar@10 161ce429-a9dd-4828-af4a-52023f968c89$' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10032
#		git cat-file commit refs/remotes/bar~3 | 	   grep '^git-svn-id: http://mayonaise/svnrepo/bar@9 161ce429-a9dd-4828-af4a-52023f968c89$' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10033
#		git cat-file commit refs/remotes/bar~4 | 	   grep '^git-svn-id: http://mayonaise/svnrepo/bar@6 161ce429-a9dd-4828-af4a-52023f968c89$' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10034
#		git cat-file commit refs/remotes/bar~5 | 	   grep '^git-svn-id: http://mayonaise/svnrepo/bar@1 161ce429-a9dd-4828-af4a-52023f968c89$'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10035
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10036
not ok - 3 verify metadata for /dir/a/b/c/d/e
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10037
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10038
#		git cat-file commit refs/remotes/e | 	   grep '^git-svn-id: http://mayonaise/svnrepo/dir/a/b/c/d/e@1 161ce429-a9dd-4828-af4a-52023f968c89$'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10039
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10040
not ok - 4 verify metadata for /dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10041
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10042
#		git cat-file commit refs/remotes/dir | 	   grep '^git-svn-id: http://mayonaise/svnrepo/dir@2 161ce429-a9dd-4828-af4a-52023f968c89$' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10043
#		git cat-file commit refs/remotes/dir~1 | 	   grep '^git-svn-id: http://mayonaise/svnrepo/dir@1 161ce429-a9dd-4828-af4a-52023f968c89$'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10044
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10045
fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10046
Use '--' to separate paths from revisions
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10047
not ok - 5 find commit based on SVN revision number
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10048
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10049
#	        git svn find-rev r12 |
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10050
#		    grep HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10051
#	        
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10052
not ok - 6 empty rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10053
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10054
#		git svn rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10055
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10056
# failed 6 among 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10057
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10058
make[3]: [t9110-git-svn-use-svm-props.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10059
*** t9111-git-svn-use-svnsync-props.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10060
not ok - 1 load svnsync repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10061
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10062
#		svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9111/svnsync.dump &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10063
#		git svn init --minimize-url -R arr -i bar "$svnrepo"/bar &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10064
#		git svn init --minimize-url -R argh -i dir "$svnrepo"/dir &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10065
#		git svn init --minimize-url -R argh -i e "$svnrepo"/dir/a/b/c/d/e &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10066
#		git config svn.useSvnsyncProps true &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10067
#		git svn fetch --all
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10068
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10069
not ok - 2 verify metadata for /bar
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10070
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10071
#		git cat-file commit refs/remotes/bar | 	   grep '^git-svn-id: http://mayonaise/svnrepo/bar@12 161ce429-a9dd-4828-af4a-52023f968c89$' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10072
#		git cat-file commit refs/remotes/bar~1 | 	   grep '^git-svn-id: http://mayonaise/svnrepo/bar@11 161ce429-a9dd-4828-af4a-52023f968c89$' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10073
#		git cat-file commit refs/remotes/bar~2 | 	   grep '^git-svn-id: http://mayonaise/svnrepo/bar@10 161ce429-a9dd-4828-af4a-52023f968c89$' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10074
#		git cat-file commit refs/remotes/bar~3 | 	   grep '^git-svn-id: http://mayonaise/svnrepo/bar@9 161ce429-a9dd-4828-af4a-52023f968c89$' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10075
#		git cat-file commit refs/remotes/bar~4 | 	   grep '^git-svn-id: http://mayonaise/svnrepo/bar@6 161ce429-a9dd-4828-af4a-52023f968c89$' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10076
#		git cat-file commit refs/remotes/bar~5 | 	   grep '^git-svn-id: http://mayonaise/svnrepo/bar@1 161ce429-a9dd-4828-af4a-52023f968c89$'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10077
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10078
not ok - 3 verify metadata for /dir/a/b/c/d/e
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10079
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10080
#		git cat-file commit refs/remotes/e | 	   grep '^git-svn-id: http://mayonaise/svnrepo/dir/a/b/c/d/e@1 161ce429-a9dd-4828-af4a-52023f968c89$'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10081
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10082
not ok - 4 verify metadata for /dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10083
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10084
#		git cat-file commit refs/remotes/dir | 	   grep '^git-svn-id: http://mayonaise/svnrepo/dir@2 161ce429-a9dd-4828-af4a-52023f968c89$' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10085
#		git cat-file commit refs/remotes/dir~1 | 	   grep '^git-svn-id: http://mayonaise/svnrepo/dir@1 161ce429-a9dd-4828-af4a-52023f968c89$'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10086
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10087
# failed 4 among 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10088
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10089
make[3]: [t9111-git-svn-use-svnsync-props.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10090
*** t9112-git-svn-md5less-file.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10091
ok 1 - load svn dumpfile
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10092
ok 2 - initialize git svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10093
not ok - 3 fetch revisions from svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10094
#	git svn fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10095
# failed 1 among 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10096
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10097
make[3]: [t9112-git-svn-md5less-file.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10098
*** t9113-git-svn-dcommit-new-file.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10099
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10100
1..0 # SKIP skipping svnserve test. (set $SVNSERVE_PORT to enable)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10101
*** t9114-git-svn-dcommit-merge.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10102
ok 1 - setup svn repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10103
not ok - 2 setup git mirror and merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10104
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10105
#		git svn init "$svnrepo" -t tags -T trunk -b branches &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10106
#		git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10107
#		git checkout --track -b svn remotes/trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10108
#		git checkout -b merge &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10109
#		echo new file > new_file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10110
#		git add new_file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10111
#		git commit -a -m "New file" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10112
#		echo hello >> README &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10113
#		git commit -a -m "hello" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10114
#		echo add some stuff >> new_file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10115
#		git commit -a -m "add some stuff" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10116
#		git checkout svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10117
#		mv -f README tmp &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10118
#		echo friend > README &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10119
#		cat tmp >> README &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10120
#		git commit -a -m "friend" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10121
#		git pull . merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10122
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10123
not ok - 3 verify pre-merge ancestry
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10124
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10125
#		test x`git rev-parse --verify refs/heads/svn^2` = 	     x`git rev-parse --verify refs/heads/merge` &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10126
#		git cat-file commit refs/heads/svn^ | grep '^friend$'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10127
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10128
not ok - 4 git svn dcommit merges
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10129
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10130
#		git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10131
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10132
not ok - 5 verify post-merge ancestry
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10133
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10134
#		test x`git rev-parse --verify refs/heads/svn` = 	     x`git rev-parse --verify refs/remotes/trunk ` &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10135
#		test x`git rev-parse --verify refs/heads/svn^2` = 	     x`git rev-parse --verify refs/heads/merge` &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10136
#		git cat-file commit refs/heads/svn^ | grep '^friend$'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10137
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10138
not ok - 6 verify merge commit message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10139
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10140
#		git rev-list --pretty=raw -1 refs/heads/svn | 	  grep "    Merge branch 'merge' into svn"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10141
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10142
# failed 5 among 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10143
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10144
make[3]: [t9114-git-svn-dcommit-merge.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10145
*** t9115-git-svn-dcommit-funky-renames.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10146
ok 1 - load repository with strange names
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10147
not ok - 2 init and fetch repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10148
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10149
#		git svn init "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10150
#		git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10151
#		git reset --hard git-svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10152
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10153
not ok - 3 create file in existing ugly and empty dir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10154
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10155
#		mkdir -p "#{bad_directory_name}" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10156
#		echo hi > "#{bad_directory_name}/ foo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10157
#		git update-index --add "#{bad_directory_name}/ foo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10158
#		git commit -m "new file in ugly parent" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10159
#		git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10160
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10161
not ok - 4 rename ugly file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10162
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10163
#		git mv "#{bad_directory_name}/ foo" "file name with feces" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10164
#		git commit -m "rename ugly file" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10165
#		git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10166
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10167
not ok - 5 rename pretty file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10168
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10169
#		echo :x > pretty &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10170
#		git update-index --add pretty &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10171
#		git commit -m "pretty :x" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10172
#		git svn dcommit &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10173
#		mkdir -p regular_dir_name &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10174
#		git mv pretty regular_dir_name/pretty &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10175
#		git commit -m "moved pretty file" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10176
#		git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10177
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10178
not ok - 6 rename pretty file into ugly one
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10179
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10180
#		git mv regular_dir_name/pretty "#{bad_directory_name}/ booboo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10181
#		git commit -m booboo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10182
#		git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10183
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10184
not ok - 7 add a file with plus signs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10185
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10186
#		echo .. > +_+ &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10187
#		git update-index --add +_+ &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10188
#		git commit -m plus &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10189
#		mkdir gtk+ &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10190
#		git mv +_+ gtk+/_+_ &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10191
#		git commit -m plus_dir &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10192
#		git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10193
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10194
not ok - 8 clone the repository to test rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10195
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10196
#		git svn clone "$svnrepo" test-rebase &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10197
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10198
#			cd test-rebase &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10199
#			echo test-rebase >test-rebase &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10200
#			git add test-rebase &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10201
#			git commit -m test-rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10202
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10203
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10204
not ok - 9 make a commit to test rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10205
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10206
#			echo test-rebase-main > test-rebase-main &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10207
#			git add test-rebase-main &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10208
#			git commit -m test-rebase-main &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10209
#			git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10210
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10211
not ok - 10 git svn rebase works inside a fresh-cloned repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10212
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10213
#		cd test-rebase &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10214
#			git svn rebase &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10215
#			test -e test-rebase-main &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10216
#			test -e test-rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10217
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10218
# failed 9 among 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10219
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10220
make[3]: [t9115-git-svn-dcommit-funky-renames.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10221
*** t9116-git-svn-log.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10222
not ok - 1 setup repository and import
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10223
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10224
#		mkdir import &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10225
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10226
#			cd import &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10227
#			for i in trunk branches/a branches/b tags/0.1 tags/0.2 tags/0.3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10228
#			do
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10229
#				mkdir -p $i &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10230
#				echo hello >>$i/README ||
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10231
#				exit 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10232
#			done &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10233
#			svn_cmd import -m test . "$svnrepo"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10234
#		) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10235
#		git svn init "$svnrepo" -T trunk -b branches -t tags &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10236
#		git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10237
#		git reset --hard trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10238
#		echo bye >> README &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10239
#		git commit -a -m bye &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10240
#		git svn dcommit &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10241
#		git reset --hard a &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10242
#		echo why >> FEEDME &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10243
#		git update-index --add FEEDME &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10244
#		git commit -m feedme &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10245
#		git svn dcommit &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10246
#		git reset --hard trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10247
#		echo aye >> README &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10248
#		git commit -a -m aye &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10249
#		git svn dcommit &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10250
#		git reset --hard b &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10251
#		echo spy >> README &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10252
#		git commit -a -m spy &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10253
#		echo try >> README &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10254
#		git commit -a -m try &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10255
#		git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10256
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10257
not ok - 2 run log
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10258
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10259
#		git reset --hard a &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10260
#		git svn log -r2 trunk | grep ^r2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10261
#		git svn log -r4 trunk | grep ^r4 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10262
#		git svn log -r3 | grep ^r3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10263
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10264
not ok - 3 run log against a from trunk
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10265
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10266
#		git reset --hard trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10267
#		git svn log -r3 a | grep ^r3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10268
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10269
not ok - 4 test ascending revision range
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10270
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10271
#		git reset --hard trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10272
#		git svn log -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 -
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10273
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10274
not ok - 5 test ascending revision range with --show-commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10275
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10276
#		git reset --hard trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10277
#		git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 -
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10278
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10279
not ok - 6 test ascending revision range with --show-commit (sha1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10280
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10281
#		git svn find-rev r1 >expected-range-r1-r2-r4-sha1 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10282
#		git svn find-rev r2 >>expected-range-r1-r2-r4-sha1 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10283
#		git svn find-rev r4 >>expected-range-r1-r2-r4-sha1 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10284
#		git reset --hard trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10285
#		git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f2 >out &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10286
#		git rev-parse $(cat out) >actual &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10287
#		test_cmp expected-range-r1-r2-r4-sha1 actual
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10288
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10289
not ok - 7 test descending revision range
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10290
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10291
#		git reset --hard trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10292
#		git svn log -r 4:1 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4-r2-r1 -
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10293
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10294
not ok - 8 test ascending revision range with unreachable revision
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10295
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10296
#		git reset --hard trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10297
#		git svn log -r 1:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2 -
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10298
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10299
not ok - 9 test descending revision range with unreachable revision
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10300
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10301
#		git reset --hard trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10302
#		git svn log -r 3:1 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2-r1 -
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10303
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10304
not ok - 10 test ascending revision range with unreachable upper boundary revision and 1 commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10305
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10306
#		git reset --hard trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10307
#		git svn log -r 2:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2 -
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10308
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10309
not ok - 11 test descending revision range with unreachable upper boundary revision and 1 commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10310
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10311
#		git reset --hard trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10312
#		git svn log -r 3:2 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2 -
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10313
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10314
not ok - 12 test ascending revision range with unreachable lower boundary revision and 1 commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10315
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10316
#		git reset --hard trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10317
#		git svn log -r 3:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 -
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10318
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10319
not ok - 13 test descending revision range with unreachable lower boundary revision and 1 commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10320
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10321
#		git reset --hard trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10322
#		git svn log -r 4:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 -
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10323
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10324
not ok - 14 test ascending revision range with unreachable boundary revisions and no commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10325
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10326
#		git reset --hard trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10327
#		git svn log -r 5:6 | test_cmp expected-separator -
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10328
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10329
not ok - 15 test descending revision range with unreachable boundary revisions and no commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10330
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10331
#		git reset --hard trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10332
#		git svn log -r 6:5 | test_cmp expected-separator -
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10333
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10334
not ok - 16 test ascending revision range with unreachable boundary revisions and 1 commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10335
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10336
#		git reset --hard trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10337
#		git svn log -r 3:5 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 -
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10338
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10339
not ok - 17 test descending revision range with unreachable boundary revisions and 1 commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10340
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10341
#		git reset --hard trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10342
#		git svn log -r 5:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 -
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10343
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10344
# failed 17 among 17 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10345
1..17
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10346
make[3]: [t9116-git-svn-log.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10347
*** t9117-git-svn-init-clone.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10348
ok 1 - setup svnrepo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10349
not ok - 2 basic clone
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10350
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10351
#		test ! -d trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10352
#		git svn clone "$svnrepo"/project/trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10353
#		test -d trunk/.git/svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10354
#		test -e trunk/foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10355
#		rm -rf trunk
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10356
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10357
not ok - 3 clone to target directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10358
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10359
#		test ! -d target &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10360
#		git svn clone "$svnrepo"/project/trunk target &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10361
#		test -d target/.git/svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10362
#		test -e target/foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10363
#		rm -rf target
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10364
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10365
not ok - 4 clone with --stdlayout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10366
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10367
#		test ! -d project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10368
#		git svn clone -s "$svnrepo"/project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10369
#		test -d project/.git/svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10370
#		test -e project/foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10371
#		rm -rf project
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10372
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10373
not ok - 5 clone to target directory with --stdlayout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10374
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10375
#		test ! -d target &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10376
#		git svn clone -s "$svnrepo"/project target &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10377
#		test -d target/.git/svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10378
#		test -e target/foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10379
#		rm -rf target
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10380
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10381
# failed 4 among 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10382
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10383
make[3]: [t9117-git-svn-init-clone.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10384
*** t9118-git-svn-funky-branch-names.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10385
ok 1 - setup svnrepo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10386
not ok - 2 test clone with funky branch names
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10387
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10388
#		git svn clone -s "$svnrepo/pr ject" project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10389
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10390
#			cd project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10391
#			git rev-parse "refs/remotes/fun%20plugin" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10392
#			git rev-parse "refs/remotes/more%20fun%20plugin!" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10393
#			git rev-parse "refs/remotes/$scary_ref" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10394
#			git rev-parse "refs/remotes/%2Eleading_dot" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10395
#			git rev-parse "refs/remotes/trailing_dot%2E" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10396
#			git rev-parse "refs/remotes/trailing_dotlock%2Elock" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10397
#			git rev-parse "refs/remotes/not-a%40{0}reflog"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10398
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10399
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10400
not ok - 3 test dcommit to funky branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10401
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10402
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10403
#			cd project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10404
#			git reset --hard 'refs/remotes/more%20fun%20plugin!' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10405
#			echo hello >> foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10406
#			git commit -m 'hello' -- foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10407
#			git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10408
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10409
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10410
not ok - 4 test dcommit to scary branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10411
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10412
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10413
#			cd project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10414
#			git reset --hard "refs/remotes/$scary_ref" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10415
#			echo urls are scary >> foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10416
#			git commit -m "eep" -- foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10417
#			git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10418
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10419
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10420
not ok - 5 test dcommit to trailing_dotlock branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10421
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10422
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10423
#			cd project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10424
#			git reset --hard "refs/remotes/trailing_dotlock%2Elock" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10425
#			echo who names branches like this anyway? >> foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10426
#			git commit -m "bar" -- foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10427
#			git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10428
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10429
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10430
# failed 4 among 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10431
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10432
make[3]: [t9118-git-svn-funky-branch-names.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10433
*** t9119-git-svn-info.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10434
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10435
1..0 # SKIP skipping svn-info test (SVN version: 1.7.19 not supported)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10436
*** t9120-git-svn-clone-with-percent-escapes.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10437
ok 1 - setup svnrepo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10438
not ok - 2 test clone with percent escapes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10439
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10440
#		git svn clone "$svnrepo/pr%20ject" clone &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10441
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10442
#			cd clone &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10443
#			git rev-parse refs/${remotes_git_svn}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10444
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10445
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10446
ok 3 - svn checkout with percent escapes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10447
ok 4 - svn checkout with space
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10448
not ok - 5 test clone trunk with percent escapes and minimize-url
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10449
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10450
#		git svn clone --minimize-url "$svnrepo/pr%20ject/trunk" minimize &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10451
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10452
#			cd minimize &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10453
#			git rev-parse refs/${remotes_git_svn}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10454
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10455
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10456
not ok - 6 test clone trunk with percent escapes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10457
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10458
#		git svn clone "$svnrepo/pr%20ject/trunk" trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10459
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10460
#			cd trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10461
#			git rev-parse refs/${remotes_git_svn}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10462
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10463
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10464
not ok - 7 test clone --stdlayout with percent escapes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10465
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10466
#		git svn clone --stdlayout "$svnrepo/pr%20ject" percent &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10467
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10468
#			cd percent &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10469
#			git rev-parse refs/remotes/trunk^0 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10470
#			git rev-parse refs/remotes/b^0 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10471
#			git rev-parse refs/remotes/tags/v1^0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10472
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10473
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10474
not ok - 8 test clone -s with unescaped space
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10475
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10476
#		git svn clone -s "$svnrepo/pr ject" space &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10477
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10478
#			cd space &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10479
#			git rev-parse refs/remotes/trunk^0 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10480
#			git rev-parse refs/remotes/b^0 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10481
#			git rev-parse refs/remotes/tags/v1^0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10482
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10483
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10484
# failed 5 among 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10485
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10486
make[3]: [t9120-git-svn-clone-with-percent-escapes.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10487
*** t9121-git-svn-fetch-renamed-dir.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10488
ok 1 - load repository with renamed directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10489
not ok - 2 init and fetch repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10490
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10491
#		git svn init "$svnrepo/newname" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10492
#		git svn fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10493
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10494
# failed 1 among 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10495
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10496
make[3]: [t9121-git-svn-fetch-renamed-dir.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10497
*** t9122-git-svn-author.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10498
ok 1 - setup svn repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10499
not ok - 2 interact with it via git svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10500
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10501
#		mkdir work.git &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10502
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10503
#			cd work.git &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10504
#			git svn init "$svnrepo"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10505
#			git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10506
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10507
#			echo modification >file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10508
#			test_tick &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10509
#			git commit -a -m second &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10510
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10511
#			test_tick &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10512
#			git svn dcommit &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10513
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10514
#			echo "further modification" >file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10515
#			test_tick &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10516
#			git commit -a -m third &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10517
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10518
#			test_tick &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10519
#			git svn --add-author-from dcommit &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10520
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10521
#			echo "yet further modification" >file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10522
#			test_tick &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10523
#			git commit -a -m fourth &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10524
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10525
#			test_tick &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10526
#			git svn --add-author-from --use-log-author dcommit &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10527
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10528
#			git log &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10529
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10530
#			git show -s HEAD^^ >../actual.2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10531
#			git show -s HEAD^  >../actual.3 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10532
#			git show -s HEAD   >../actual.4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10533
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10534
#		) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10535
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10536
#		# Make sure that --add-author-from without --use-log-author
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10537
#		# did not affect the authorship information
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10538
#		myself=$(grep "^Author: " actual.2) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10539
#		unaffected=$(grep "^Author: " actual.3) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10540
#		test "z$myself" = "z$unaffected" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10541
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10542
#		# Make sure lack of --add-author-from did not add cruft
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10543
#		! grep "^    From: A U Thor " actual.2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10544
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10545
#		# Make sure --add-author-from added cruft
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10546
#		grep "^    From: A U Thor " actual.3 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10547
#		grep "^    From: A U Thor " actual.4 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10548
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10549
#		# Make sure --add-author-from with --use-log-author affected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10550
#		# the authorship information
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10551
#		grep "^Author: A U Thor " actual.4 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10552
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10553
#		# Make sure there are no commit messages with excess blank lines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10554
#		test $(grep "^ " actual.2 | wc -l) = 3 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10555
#		test $(grep "^ " actual.3 | wc -l) = 5 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10556
#		test $(grep "^ " actual.4 | wc -l) = 5 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10557
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10558
#		# Make sure there are no svn commit messages with excess blank lines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10559
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10560
#			cd work.svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10561
#			svn_cmd up &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10562
#			
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10563
#			test $(svn_cmd log -r2:2 | wc -l) = 5 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10564
#			test $(svn_cmd log -r4:4 | wc -l) = 7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10565
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10566
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10567
# failed 1 among 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10568
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10569
make[3]: [t9122-git-svn-author.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10570
*** t9123-git-svn-rebuild-with-rewriteroot.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10571
not ok - 1 init, fetch and checkout repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10572
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10573
#		git svn init --rewrite-root=http://invalid.invalid/ "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10574
#		git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10575
#		git checkout -b mybranch ${remotes_git_svn}
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10576
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10577
not ok - 2 remove rev_map
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10578
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10579
#		rm "$GIT_SVN_DIR"/.rev_map.*
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10580
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10581
not ok - 3 rebuild rev_map
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10582
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10583
#		git svn rebase >/dev/null
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10584
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10585
# failed 3 among 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10586
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10587
make[3]: [t9123-git-svn-rebuild-with-rewriteroot.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10588
*** t9124-git-svn-dcommit-auto-props.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10589
not ok - 1 initialize git svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10590
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10591
#		mkdir import &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10592
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10593
#			cd import &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10594
#			echo foo >foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10595
#			svn_cmd import -m "import for git svn" . "$svnrepo"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10596
#		) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10597
#		rm -rf import &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10598
#		git svn init "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10599
#		git svn fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10600
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10601
ok 2 - enable auto-props config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10602
not ok - 3 add files matching auto-props
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10603
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10604
#		echo "#!$SHELL_PATH" >exec1.sh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10605
#		chmod +x exec1.sh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10606
#		echo "hello" >hello.txt &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10607
#		echo bar >bar &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10608
#		git add exec1.sh hello.txt bar &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10609
#		git commit -m "files for enabled auto-props" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10610
#		git svn dcommit --config-dir=user
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10611
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10612
ok 4 - disable auto-props config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10613
not ok - 5 add files matching disabled auto-props
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10614
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10615
#		echo "#$SHELL_PATH" >exec2.sh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10616
#		chmod +x exec2.sh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10617
#		echo "world" >world.txt &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10618
#		echo zot >zot &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10619
#		git add exec2.sh world.txt zot &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10620
#		git commit -m "files for disabled auto-props" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10621
#		git svn dcommit --config-dir=user
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10622
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10623
not ok - 6 check resulting svn repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10624
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10625
#	(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10626
#		mkdir work &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10627
#		cd work &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10628
#		svn_cmd co "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10629
#		cd svnrepo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10630
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10631
#		# Check properties from first commit.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10632
#		test "x$(svn_cmd propget svn:executable exec1.sh)" = "x*" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10633
#		test "x$(svn_cmd propget svn:mime-type exec1.sh)" = \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10634
#		     "xapplication/x-shellscript" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10635
#		test "x$(svn_cmd propget svn:mime-type hello.txt)" = "xtext/plain" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10636
#		test "x$(svn_cmd propget svn:eol-style hello.txt)" = "xnative" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10637
#		test "x$(svn_cmd propget svn:mime-type bar)" = "x" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10638
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10639
#		# Check properties from second commit.
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10640
#		test "x$(svn_cmd propget svn:executable exec2.sh)" = "x*" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10641
#		test "x$(svn_cmd propget svn:mime-type exec2.sh)" = "x" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10642
#		test "x$(svn_cmd propget svn:mime-type world.txt)" = "x" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10643
#		test "x$(svn_cmd propget svn:eol-style world.txt)" = "x" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10644
#		test "x$(svn_cmd propget svn:mime-type zot)" = "x"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10645
#	)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10646
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10647
not ok - 7 check renamed file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10648
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10649
#		test -d user &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10650
#		generate_auto_props yes > user/config &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10651
#		git mv foo foo.sh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10652
#		git commit -m "foo => foo.sh" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10653
#		git svn dcommit --config-dir=user &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10654
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10655
#			cd work/svnrepo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10656
#			svn_cmd up &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10657
#			test ! -e foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10658
#			test -e foo.sh &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10659
#			test "x$(svn_cmd propget svn:mime-type foo.sh)" = \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10660
#			     "xapplication/x-shellscript" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10661
#			test "x$(svn_cmd propget svn:eol-style foo.sh)" = "xLF"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10662
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10663
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10664
# failed 5 among 7 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10665
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10666
make[3]: [t9124-git-svn-dcommit-auto-props.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10667
*** t9125-git-svn-multi-glob-branch-names.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10668
ok 1 - setup svnrepo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10669
not ok - 2 test clone with multi-glob in branch names
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10670
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10671
#		git svn clone -T trunk -b branches/*/* -t tags \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10672
#		              "$svnrepo/project" project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10673
#		(cd project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10674
#			git rev-parse "refs/remotes/v14.1/beta" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10675
#			git rev-parse "refs/remotes/v14.1/gold"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10676
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10677
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10678
not ok - 3 test dcommit to multi-globbed branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10679
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10680
#		(cd project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10681
#		git reset --hard 'refs/remotes/v14.1/gold' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10682
#		echo hello >> foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10683
#		git commit -m 'hello' -- foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10684
#		git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10685
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10686
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10687
# failed 2 among 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10688
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10689
make[3]: [t9125-git-svn-multi-glob-branch-names.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10690
*** t9126-git-svn-follow-deleted-readded-directory.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10691
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10692
1..0 # SKIP skipping svnserve test. (set $SVNSERVE_PORT to enable)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10693
*** t9127-git-svn-partial-rebuild.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10694
not ok - 1 initialize svnrepo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10695
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10696
#		mkdir import &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10697
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10698
#			(cd import &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10699
#			mkdir trunk branches tags &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10700
#			(cd trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10701
#			echo foo > foo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10702
#			) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10703
#			svn_cmd import -m "import for git-svn" . "$svnrepo" >/dev/null &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10704
#			svn_cmd copy "$svnrepo"/trunk "$svnrepo"/branches/a \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10705
#				-m "created branch a"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10706
#			) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10707
#			rm -rf import &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10708
#			svn_cmd co "$svnrepo"/trunk trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10709
#			(cd trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10710
#			echo bar >> foo &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10711
#			svn_cmd ci -m "updated trunk"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10712
#			) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10713
#			svn_cmd co "$svnrepo"/branches/a a &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10714
#			(cd a &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10715
#			echo baz >> a &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10716
#			svn_cmd add a &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10717
#			svn_cmd ci -m "updated a"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10718
#			) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10719
#			git svn init --stdlayout "$svnrepo"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10720
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10721
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10722
not ok - 2 import an early SVN revision into git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10723
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10724
#		git svn fetch -r1:2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10725
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10726
not ok - 3 make full git mirror of SVN
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10727
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10728
#		mkdir mirror &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10729
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10730
#			(cd mirror &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10731
#			git init &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10732
#			git svn init --stdlayout "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10733
#			git svn fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10734
#			)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10735
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10736
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10737
not ok - 4 fetch from git mirror and partial-rebuild
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10738
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10739
#		git config --add remote.origin.url "file://$PWD/mirror/.git" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10740
#		git config --add remote.origin.fetch refs/remotes/*:refs/remotes/* &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10741
#		git fetch origin &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10742
#		git svn fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10743
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10744
# failed 4 among 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10745
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10746
make[3]: [t9127-git-svn-partial-rebuild.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10747
*** t9128-git-svn-cmd-branch.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10748
ok 1 - initialize svnrepo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10749
not ok - 2 import into git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10750
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10751
#		git svn init --stdlayout "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10752
#		git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10753
#		git checkout remotes/trunk
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10754
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10755
not ok - 3 git svn branch tests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10756
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10757
#		git svn branch a &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10758
#		base=$(git rev-parse HEAD:) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10759
#		test $base = $(git rev-parse remotes/a:) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10760
#		git svn branch -m "created branch b blah" b &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10761
#		test $base = $(git rev-parse remotes/b:) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10762
#		test_must_fail git branch -m "no branchname" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10763
#		git svn branch -n c &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10764
#		test_must_fail git rev-parse remotes/c &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10765
#		test_must_fail git svn branch a &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10766
#		git svn branch -t tag1 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10767
#		test $base = $(git rev-parse remotes/tags/tag1:) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10768
#		git svn branch --tag tag2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10769
#		test $base = $(git rev-parse remotes/tags/tag2:) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10770
#		git svn tag tag3 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10771
#		test $base = $(git rev-parse remotes/tags/tag3:) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10772
#		git svn tag -m "created tag4 foo" tag4 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10773
#		test $base = $(git rev-parse remotes/tags/tag4:) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10774
#		test_must_fail git svn tag -m "no tagname" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10775
#		git svn tag -n tag5 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10776
#		test_must_fail git rev-parse remotes/tags/tag5 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10777
#		test_must_fail git svn tag tag1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10778
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10779
not ok - 4 branch uses correct svn-remote
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10780
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10781
#		(svn_cmd co "$svnrepo" svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10782
#		cd svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10783
#		mkdir mirror &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10784
#		svn_cmd add mirror &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10785
#		svn_cmd copy trunk mirror/ &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10786
#		svn_cmd copy tags mirror/ &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10787
#		svn_cmd copy branches mirror/ &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10788
#		svn_cmd ci -m "made mirror" ) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10789
#		rm -rf svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10790
#		git svn init -s -R mirror --prefix=mirror/ "$svnrepo"/mirror &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10791
#		git svn fetch -R mirror &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10792
#		git checkout mirror/trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10793
#		base=$(git rev-parse HEAD:) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10794
#		git svn branch -m "branch in mirror" d &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10795
#		test $base = $(git rev-parse remotes/mirror/d:) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10796
#		test_must_fail git rev-parse remotes/d
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10797
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10798
# failed 3 among 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10799
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10800
make[3]: [t9128-git-svn-cmd-branch.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10801
*** t9129-git-svn-i18n-commitencoding.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10802
not ok - 1 ISO8859-1 setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10803
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10804
#			mkdir $H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10805
#			svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10806
#			git svn clone "$svnrepo"/$H $H
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10807
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10808
not ok - 2 eucJP setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10809
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10810
#			mkdir $H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10811
#			svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10812
#			git svn clone "$svnrepo"/$H $H
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10813
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10814
not ok - 3 ISO-2022-JP setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10815
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10816
#			mkdir $H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10817
#			svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10818
#			git svn clone "$svnrepo"/$H $H
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10819
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10820
not ok - 4 ISO8859-1 commit on git side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10821
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10822
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10823
#			cd $H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10824
#			git config i18n.commitencoding $H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10825
#			git checkout -b t refs/remotes/git-svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10826
#			echo $H >F &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10827
#			git add F &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10828
#			git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10829
#			E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10830
#			test "z$E" = "z$H"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10831
#			compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10832
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10833
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10834
not ok - 5 eucJP commit on git side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10835
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10836
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10837
#			cd $H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10838
#			git config i18n.commitencoding $H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10839
#			git checkout -b t refs/remotes/git-svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10840
#			echo $H >F &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10841
#			git add F &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10842
#			git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10843
#			E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10844
#			test "z$E" = "z$H"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10845
#			compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10846
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10847
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10848
not ok - 6 ISO-2022-JP commit on git side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10849
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10850
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10851
#			cd $H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10852
#			git config i18n.commitencoding $H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10853
#			git checkout -b t refs/remotes/git-svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10854
#			echo $H >F &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10855
#			git add F &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10856
#			git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10857
#			E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10858
#			test "z$E" = "z$H"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10859
#			compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10860
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10861
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10862
not ok - 7 ISO8859-1 dcommit to svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10863
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10864
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10865
#			cd $H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10866
#			git svn dcommit &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10867
#			git cat-file commit HEAD | grep git-svn-id: &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10868
#			E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10869
#			test "z$E" = "z$H" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10870
#			compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10871
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10872
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10873
not ok - 8 eucJP dcommit to svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10874
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10875
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10876
#			cd $H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10877
#			git svn dcommit &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10878
#			git cat-file commit HEAD | grep git-svn-id: &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10879
#			E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10880
#			test "z$E" = "z$H" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10881
#			compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10882
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10883
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10884
not ok - 9 ISO-2022-JP dcommit to svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10885
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10886
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10887
#			cd $H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10888
#			git svn dcommit &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10889
#			git cat-file commit HEAD | grep git-svn-id: &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10890
#			E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10891
#			test "z$E" = "z$H" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10892
#			compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10893
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10894
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10895
not ok - 10 ISO-8859-1 should match UTF-8 in svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10896
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10897
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10898
#			cd ISO8859-1 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10899
#			compare_svn_head_with "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10900
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10901
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10902
not ok - 11 eucJP should match UTF-8 in svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10903
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10904
#			(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10905
#				cd $H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10906
#				compare_svn_head_with "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10907
#			)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10908
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10909
not ok - 12 ISO-2022-JP should match UTF-8 in svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10910
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10911
#			(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10912
#				cd $H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10913
#				compare_svn_head_with "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10914
#			)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10915
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10916
# failed 12 among 12 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10917
1..12
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10918
make[3]: [t9129-git-svn-i18n-commitencoding.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10919
*** t9130-git-svn-authors-file.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10920
ok 1 - setup svnrepo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10921
not ok - 2 start import with incomplete authors file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10922
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10923
#		test_must_fail git svn clone --authors-file=svn-authors "$svnrepo" x
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10924
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10925
not ok - 3 imported 2 revisions successfully
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10926
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10927
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10928
#			cd x
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10929
#			test "`git rev-list refs/remotes/git-svn | wc -l`" -eq 2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10930
#			git rev-list -1 --pretty=raw refs/remotes/git-svn | \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10931
#			  grep "^author BBBBBBB BBBBBBB <bb@example\.com> " &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10932
#			git rev-list -1 --pretty=raw refs/remotes/git-svn~1 | \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10933
#			  grep "^author AAAAAAA AAAAAAA <aa@example\.com> "
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10934
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10935
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10936
not ok - 4 continues to import once authors have been added
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10937
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10938
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10939
#			cd x
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10940
#			git svn fetch --authors-file=../svn-authors &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10941
#			test "`git rev-list refs/remotes/git-svn | wc -l`" -eq 4 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10942
#			git rev-list -1 --pretty=raw refs/remotes/git-svn | \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10943
#			  grep "^author DDDDDDD DDDDDDD <dd@example\.com> " &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10944
#			git rev-list -1 --pretty=raw refs/remotes/git-svn~1 | \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10945
#			  grep "^author CCCCCCC CCCCCCC <cc@example\.com> "
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10946
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10947
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10948
not ok - 5 authors-file against globs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10949
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10950
#		svn_cmd mkdir -m globs --username aa \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10951
#		  "$svnrepo"/aa/trunk "$svnrepo"/aa/branches "$svnrepo"/aa/tags &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10952
#		git svn clone --authors-file=svn-authors -s "$svnrepo"/aa aa-work &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10953
#		for i in bb ee cc
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10954
#		do
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10955
#			branch="aa/branches/$i"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10956
#			svn_cmd mkdir -m "$branch" --username $i "$svnrepo/$branch"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10957
#		done
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10958
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10959
ok 6 - fetch fails on ee
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10960
not ok - 7 failure happened without negative side effects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10961
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10962
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10963
#			cd aa-work &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10964
#			test 6 -eq "`tmp_config_get svn-remote.svn.branches-maxRev`" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10965
#			test 6 -eq "`tmp_config_get svn-remote.svn.tags-maxRev`"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10966
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10967
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10968
not ok - 8 fetch continues after authors-file is fixed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10969
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10970
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10971
#			cd aa-work &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10972
#			git svn fetch --authors-file=../svn-authors &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10973
#			test 8 -eq "`tmp_config_get svn-remote.svn.branches-maxRev`" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10974
#			test 8 -eq "`tmp_config_get svn-remote.svn.tags-maxRev`"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10975
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10976
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10977
not ok - 9 fresh clone with svn.authors-file in config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10978
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10979
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10980
#			rm -r "$GIT_DIR" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10981
#			test x = x"$(git config svn.authorsfile)" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10982
#			test_config="$HOME"/.gitconfig &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10983
#			sane_unset GIT_DIR &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10984
#			sane_unset GIT_CONFIG &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10985
#			git config --global \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10986
#			  svn.authorsfile "$HOME"/svn-authors &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10987
#			test x"$HOME"/svn-authors = x"$(git config svn.authorsfile)" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10988
#			git svn clone "$svnrepo" gitconfig.clone &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10989
#			cd gitconfig.clone &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10990
#			nr_ex=$(git log | grep "^Author:.*example.com" | wc -l) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10991
#			nr_rev=$(git rev-list HEAD | wc -l) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10992
#			test $nr_rev -eq $nr_ex
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10993
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10994
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10995
# failed 7 among 9 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10996
1..9
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10997
make[3]: [t9130-git-svn-authors-file.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10998
*** t9131-git-svn-empty-symlink.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 10999
ok 1 - load svn dumpfile
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11000
not ok - 2 clone using git svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11001
#	git svn clone -r1 "$svnrepo" x
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11002
ok 3 - enable broken symlink workaround
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11003
not ok - 4 "bar" is an empty file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11004
#	test -f x/bar && ! test -s x/bar
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11005
not ok - 5 get "bar" => symlink fix from svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11006
#	(cd x && git svn rebase)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11007
not ok - 6 "bar" becomes a symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11008
#	test -h x/bar
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11009
not ok - 7 clone using git svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11010
#	git svn clone -r1 "$svnrepo" y
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11011
ok 8 - disable broken symlink workaround
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11012
not ok - 9 "bar" is an empty file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11013
#	test -f y/bar && ! test -s y/bar
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11014
not ok - 10 get "bar" => symlink fix from svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11015
#	(cd y && git svn rebase)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11016
ok 11 - "bar" does not become a symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11017
not ok - 12 clone using git svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11018
#	git svn clone -r1 "$svnrepo" z
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11019
not ok - 13 "bar" is an empty file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11020
#	test -f z/bar && ! test -s z/bar
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11021
not ok - 14 get "bar" => symlink fix from svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11022
#	(cd z && git svn rebase)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11023
ok 15 - "bar" does not become a symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11024
# failed 10 among 15 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11025
1..15
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11026
make[3]: [t9131-git-svn-empty-symlink.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11027
*** t9132-git-svn-broken-symlink.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11028
ok 1 - load svn dumpfile
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11029
not ok - 2 clone using git svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11030
#	git svn clone -r1 "$svnrepo" x
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11031
not ok - 3 "bar" is a symlink that points to "asdf"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11032
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11033
#		test -L x/bar &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11034
#		(cd x && test xasdf = x"`git cat-file blob HEAD:bar`")
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11035
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11036
not ok - 4 get "bar" => symlink fix from svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11037
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11038
#		(cd x && git svn rebase)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11039
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11040
not ok - 5 "bar" remains a proper symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11041
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11042
#		test -L x/bar &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11043
#		(cd x && test xdoink = x"`git cat-file blob HEAD:bar`")
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11044
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11045
# failed 4 among 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11046
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11047
make[3]: [t9132-git-svn-broken-symlink.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11048
*** t9133-git-svn-nested-git-repo.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11049
ok 1 - setup repo with a git repo inside it
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11050
not ok - 2 clone an SVN repo containing a git repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11051
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11052
#		git svn clone "$svnrepo" g &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11053
#		echo a > expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11054
#		test_cmp expect g/a
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11055
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11056
ok 3 - SVN-side change outside of .git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11057
not ok - 4 update git svn-cloned repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11058
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11059
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11060
#			cd g &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11061
#			git svn rebase &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11062
#			echo a > expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11063
#			echo b >> expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11064
#			test_cmp a expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11065
#			rm expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11066
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11067
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11068
ok 5 - SVN-side change inside of .git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11069
not ok - 6 update git svn-cloned repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11070
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11071
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11072
#			cd g &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11073
#			git svn rebase &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11074
#			echo a > expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11075
#			echo b >> expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11076
#			test_cmp a expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11077
#			rm expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11078
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11079
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11080
ok 7 - SVN-side change in and out of .git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11081
not ok - 8 update git svn-cloned repo again
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11082
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11083
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11084
#			cd g &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11085
#			git svn rebase &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11086
#			echo a > expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11087
#			echo b >> expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11088
#			echo c >> expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11089
#			test_cmp a expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11090
#			rm expect
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11091
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11092
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11093
# failed 4 among 8 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11094
1..8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11095
make[3]: [t9133-git-svn-nested-git-repo.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11096
*** t9134-git-svn-ignore-paths.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11097
ok 1 - setup test repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11098
not ok - 2 clone an SVN repository with ignored www directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11099
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11100
#		git svn clone --ignore-paths="^www" "$svnrepo" g &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11101
#		echo test_qqq > expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11102
#		for i in g/*/*.txt; do cat $i >> expect2; done &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11103
#		test_cmp expect expect2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11104
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11105
not ok - 3 init+fetch an SVN repository with ignored www directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11106
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11107
#		git svn init "$svnrepo" c &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11108
#		( cd c && git svn fetch --ignore-paths="^www" ) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11109
#		rm expect2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11110
#		echo test_qqq > expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11111
#		for i in c/*/*.txt; do cat $i >> expect2; done &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11112
#		test_cmp expect expect2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11113
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11114
ok 4 - verify ignore-paths config saved by clone
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11115
ok 5 - SVN-side change outside of www
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11116
not ok - 6 update git svn-cloned repo (config ignore)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11117
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11118
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11119
#			cd g &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11120
#			git svn rebase &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11121
#			printf "test_qqq
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11122
#	b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11123
#	" > expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11124
#			for i in */*.txt; do cat $i >> expect2; done &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11125
#			test_cmp expect2 expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11126
#			rm expect expect2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11127
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11128
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11129
not ok - 7 update git svn-cloned repo (option ignore)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11130
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11131
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11132
#			cd c &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11133
#			git svn rebase --ignore-paths="^www" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11134
#			printf "test_qqq
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11135
#	b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11136
#	" > expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11137
#			for i in */*.txt; do cat $i >> expect2; done &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11138
#			test_cmp expect2 expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11139
#			rm expect expect2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11140
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11141
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11142
ok 8 - SVN-side change inside of ignored www
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11143
not ok - 9 update git svn-cloned repo (config ignore)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11144
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11145
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11146
#			cd g &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11147
#			git svn rebase &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11148
#			printf "test_qqq
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11149
#	b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11150
#	" > expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11151
#			for i in */*.txt; do cat $i >> expect2; done &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11152
#			test_cmp expect2 expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11153
#			rm expect expect2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11154
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11155
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11156
not ok - 10 update git svn-cloned repo (option ignore)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11157
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11158
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11159
#			cd c &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11160
#			git svn rebase --ignore-paths="^www" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11161
#			printf "test_qqq
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11162
#	b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11163
#	" > expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11164
#			for i in */*.txt; do cat $i >> expect2; done &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11165
#			test_cmp expect2 expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11166
#			rm expect expect2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11167
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11168
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11169
ok 11 - SVN-side change in and out of ignored www
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11170
not ok - 12 update git svn-cloned repo again (config ignore)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11171
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11172
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11173
#			cd g &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11174
#			git svn rebase &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11175
#			printf "test_qqq
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11176
#	b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11177
#	ygg
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11178
#	" > expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11179
#			for i in */*.txt; do cat $i >> expect2; done &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11180
#			test_cmp expect2 expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11181
#			rm expect expect2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11182
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11183
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11184
not ok - 13 update git svn-cloned repo again (option ignore)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11185
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11186
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11187
#			cd c &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11188
#			git svn rebase --ignore-paths="^www" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11189
#			printf "test_qqq
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11190
#	b
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11191
#	ygg
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11192
#	" > expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11193
#			for i in */*.txt; do cat $i >> expect2; done &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11194
#			test_cmp expect2 expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11195
#			rm expect expect2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11196
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11197
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11198
# failed 8 among 13 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11199
1..13
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11200
make[3]: [t9134-git-svn-ignore-paths.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11201
*** t9135-git-svn-moved-branch-empty-file.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11202
ok 1 - load svn dumpfile
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11203
not ok - 2 clone using git svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11204
#	git svn clone -s "$svnrepo" x
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11205
not ok - 3 test that b1 exists and is empty
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11206
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11207
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11208
#			cd x &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11209
#			git reset --hard branch-c &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11210
#			test -f b1 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11211
#			! test -s b1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11212
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11213
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11214
# failed 2 among 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11215
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11216
make[3]: [t9135-git-svn-moved-branch-empty-file.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11217
*** t9136-git-svn-recreated-branch-empty-file.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11218
ok 1 - load svn dumpfile
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11219
not ok - 2 clone using git svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11220
#	git svn clone -s "$svnrepo" x
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11221
# failed 1 among 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11222
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11223
make[3]: [t9136-git-svn-recreated-branch-empty-file.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11224
*** t9137-git-svn-dcommit-clobber-series.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11225
not ok - 1 initialize repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11226
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11227
#		mkdir import &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11228
#		(cd import &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11229
#		awk "BEGIN { for (i = 1; i < 64; i++) { print i } }" > file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11230
#		svn_cmd import -m "initial" . "$svnrepo"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11231
#		) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11232
#		git svn init "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11233
#		git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11234
#		test -e file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11235
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11236
not ok - 2 (supposedly) non-conflicting change from SVN
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11237
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11238
#		test x"`sed -n -e 58p < file`" = x58 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11239
#		test x"`sed -n -e 61p < file`" = x61 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11240
#		svn_cmd co "$svnrepo" tmp &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11241
#		(cd tmp &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11242
#			perl -i.bak -p -e "s/^58$/5588/" file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11243
#			perl -i.bak -p -e "s/^61$/6611/" file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11244
#			poke file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11245
#			test x"`sed -n -e 58p < file`" = x5588 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11246
#			test x"`sed -n -e 61p < file`" = x6611 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11247
#			svn_cmd commit -m "58 => 5588, 61 => 6611"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11248
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11249
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11250
ok 3 - some unrelated changes to git
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11251
not ok - 4 change file but in unrelated area
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11252
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11253
#		test x"`sed -n -e 4p < file`" = x4 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11254
#		test x"`sed -n -e 7p < file`" = x7 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11255
#		perl -i.bak -p -e 's/^4$/4444/' file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11256
#		perl -i.bak -p -e 's/^7$/7777/' file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11257
#		test x"`sed -n -e 4p < file`" = x4444 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11258
#		test x"`sed -n -e 7p < file`" = x7777 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11259
#		git commit -m '4 => 4444, 7 => 7777' file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11260
#		git svn dcommit &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11261
#		svn_cmd up tmp &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11262
#		cd tmp &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11263
#			test x"`sed -n -e 4p < file`" = x4444 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11264
#			test x"`sed -n -e 7p < file`" = x7777 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11265
#			test x"`sed -n -e 58p < file`" = x5588 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11266
#			test x"`sed -n -e 61p < file`" = x6611
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11267
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11268
ok 5 - attempt to dcommit with a dirty index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11269
# failed 3 among 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11270
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11271
make[3]: [t9137-git-svn-dcommit-clobber-series.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11272
*** t9138-git-svn-authors-prog.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11273
ok 1 - setup svnrepo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11274
not ok - 2 import authors with prog and file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11275
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11276
#		git svn clone --authors-prog=./svn-authors-prog \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11277
#		    --authors-file=svn-authors "$svnrepo" x
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11278
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11279
not ok - 3 imported 6 revisions successfully
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11280
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11281
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11282
#			cd x
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11283
#			test "`git rev-list refs/remotes/git-svn | wc -l`" -eq 6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11284
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11285
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11286
not ok - 4 authors-prog ran correctly
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11287
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11288
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11289
#			cd x
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11290
#			git rev-list -1 --pretty=raw refs/remotes/git-svn~1 | \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11291
#			  grep "^author ee-foo <ee-foo@example\.com> " &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11292
#			git rev-list -1 --pretty=raw refs/remotes/git-svn~2 | \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11293
#			  grep "^author dd <dd@sub\.example\.com> " &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11294
#			git rev-list -1 --pretty=raw refs/remotes/git-svn~3 | \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11295
#			  grep "^author cc <cc@sub\.example\.com> " &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11296
#			git rev-list -1 --pretty=raw refs/remotes/git-svn~4 | \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11297
#			  grep "^author bb <bb@example\.com> " &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11298
#			git rev-list -1 --pretty=raw refs/remotes/git-svn~5 | \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11299
#			  grep "^author aa <aa@example\.com> "
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11300
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11301
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11302
not ok - 5 authors-file overrode authors-prog
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11303
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11304
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11305
#			cd x
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11306
#			git rev-list -1 --pretty=raw refs/remotes/git-svn | \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11307
#			  grep "^author FFFFFFF FFFFFFF <fFf@other\.example\.com> "
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11308
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11309
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11310
not ok - 6 authors-prog handled special characters in username
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11311
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11312
#		svn mkdir -m bad --username "xyz; touch evil" "$svnrepo"/bad &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11313
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11314
#			cd x &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11315
#			git svn --authors-prog=../svn-authors-prog fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11316
#			git rev-list -1 --pretty=raw refs/remotes/git-svn |
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11317
#			grep "^author xyz; touch evil <xyz; touch evil@example\.com> " &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11318
#			! test -f evil
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11319
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11320
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11321
# failed 5 among 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11322
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11323
make[3]: [t9138-git-svn-authors-prog.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11324
*** t9139-git-svn-non-utf8-commitencoding.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11325
not ok - 1 ISO8859-1 setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11326
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11327
#			mkdir $H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11328
#			svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11329
#			git svn clone "$svnrepo"/$H $H
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11330
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11331
not ok - 2 eucJP setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11332
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11333
#			mkdir $H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11334
#			svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11335
#			git svn clone "$svnrepo"/$H $H
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11336
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11337
not ok - 3 ISO8859-1 commit on git side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11338
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11339
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11340
#			cd $H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11341
#			git config i18n.commitencoding $H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11342
#			git checkout -b t refs/remotes/git-svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11343
#			echo $H >F &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11344
#			git add F &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11345
#			git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11346
#			E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11347
#			test "z$E" = "z$H"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11348
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11349
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11350
not ok - 4 eucJP commit on git side
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11351
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11352
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11353
#			cd $H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11354
#			git config i18n.commitencoding $H &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11355
#			git checkout -b t refs/remotes/git-svn &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11356
#			echo $H >F &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11357
#			git add F &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11358
#			git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11359
#			E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11360
#			test "z$E" = "z$H"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11361
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11362
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11363
ok 5 - ISO8859-1 dcommit to svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11364
ok 6 - eucJP dcommit to svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11365
# failed 4 among 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11366
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11367
make[3]: [t9139-git-svn-non-utf8-commitencoding.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11368
*** t9140-git-svn-reset.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11369
ok 1 - setup test repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11370
not ok - 2 clone SVN repository with hidden directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11371
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11372
#		git svn init "$svnrepo" g &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11373
#		( cd g && git svn fetch --ignore-paths="^hid" )
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11374
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11375
ok 3 - modify hidden file in SVN repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11376
not ok - 4 fetch fails on modified hidden file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11377
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11378
#		( cd g &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11379
#		  git svn find-rev refs/remotes/git-svn > ../expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11380
#		  test_must_fail git svn fetch 2> ../errors &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11381
#		  git svn find-rev refs/remotes/git-svn > ../expect2 ) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11382
#		fgrep "not found in commit" errors &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11383
#		test_cmp expect expect2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11384
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11385
not ok - 5 reset unwinds back to r1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11386
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11387
#		( cd g &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11388
#		  git svn reset -r1 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11389
#		  git svn find-rev refs/remotes/git-svn > ../expect2 ) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11390
#		echo 1 >expect &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11391
#		test_cmp expect expect2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11392
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11393
not ok - 6 refetch succeeds not ignoring any files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11394
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11395
#		( cd g &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11396
#		  git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11397
#		  git svn rebase &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11398
#		  fgrep "mod hidden" hid/hid.txt
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11399
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11400
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11401
# failed 4 among 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11402
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11403
make[3]: [t9140-git-svn-reset.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11404
*** t9141-git-svn-multiple-branches.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11405
ok 1 - setup svnrepo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11406
not ok - 2 clone multiple branch and tag paths
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11407
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11408
#		git svn clone -T trunk \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11409
#			      -b b_one/* --branches b_two/* \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11410
#			      -t tags_A/* --tags tags_B \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11411
#			      "$svnrepo/project" git_project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11412
#		( cd git_project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11413
#			git rev-parse refs/remotes/first &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11414
#			git rev-parse refs/remotes/second &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11415
#			git rev-parse refs/remotes/1 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11416
#			git rev-parse refs/remotes/2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11417
#			git rev-parse refs/remotes/tags/1.0 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11418
#			git rev-parse refs/remotes/tags/2.0 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11419
#			git rev-parse refs/remotes/tags/3.0 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11420
#			git rev-parse refs/remotes/tags/4.0 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11421
#			git rev-parse refs/remotes/tags/v5 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11422
#			git rev-parse refs/remotes/tags/v6 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11423
#			git rev-parse refs/remotes/tags/v7 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11424
#			git rev-parse refs/remotes/tags/v8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11425
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11426
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11427
ok 3 - Multiple branch or tag paths require -d
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11428
not ok - 4 create new branches and tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11429
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11430
#		( cd git_project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11431
#			git svn branch -m "New branch 1" -d b_one New1 ) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11432
#		( cd svn_project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11433
#			svn_cmd up && test -e b_one/New1/a.file ) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11434
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11435
#		( cd git_project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11436
#			git svn branch -m "New branch 2" -d b_two New2 ) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11437
#		( cd svn_project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11438
#			svn_cmd up && test -e b_two/New2/a.file ) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11439
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11440
#		( cd git_project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11441
#			git svn branch -t -m "New tag 1" -d tags_A Tag1 ) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11442
#		( cd svn_project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11443
#			svn_cmd up && test -e tags_A/Tag1/a.file ) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11444
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11445
#		( cd git_project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11446
#			git svn tag -m "New tag 2" -d tags_B Tag2 ) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11447
#		( cd svn_project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11448
#			svn_cmd up && test -e tags_B/Tag2/a.file )
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11449
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11450
# failed 2 among 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11451
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11452
make[3]: [t9141-git-svn-multiple-branches.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11453
*** t9142-git-svn-shallow-clone.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11454
ok 1 - setup test repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11455
not ok - 2 clone trunk with "-r HEAD"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11456
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11457
#		git svn clone -r HEAD "$svnrepo/trunk" g &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11458
#		( cd g && git rev-parse --symbolic --verify HEAD )
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11459
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11460
# failed 1 among 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11461
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11462
make[3]: [t9142-git-svn-shallow-clone.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11463
*** t9143-git-svn-gc.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11464
ok 1 - setup directories and test repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11465
ok 2 - checkout working copy from svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11466
ok 3 - set some properties to create an unhandled.log file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11467
ok 4 - Setup repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11468
not ok - 5 Fetch repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11469
#	git svn fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11470
not ok - 6 make backup copy of unhandled.log
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11471
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11472
#		 cp .git/svn/refs/remotes/git-svn/unhandled.log tmp
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11473
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11474
ok 7 - create leftover index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11475
ok 8 - git svn gc runs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11476
ok 9 - git svn index removed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11477
not ok - 10 git svn gc does not change unhandled.log files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11478
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11479
#		 test_cmp .git/svn/refs/remotes/git-svn/unhandled.log tmp/unhandled.log
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11480
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11481
# failed 3 among 10 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11482
1..10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11483
make[3]: [t9143-git-svn-gc.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11484
*** t9144-git-svn-old-rev_map.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11485
not ok - 1 setup test repository with old layout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11486
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11487
#		mkdir i &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11488
#		(cd i && > a) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11489
#		svn_cmd import -m- i "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11490
#		git svn init "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11491
#		git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11492
#		test -d .git/svn/refs/remotes/git-svn/ &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11493
#		! test -e .git/svn/git-svn/ &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11494
#		mv .git/svn/refs/remotes/git-svn .git/svn/ &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11495
#		rm -r .git/svn/refs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11496
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11497
not ok - 2 old layout continues to work
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11498
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11499
#		svn_cmd import -m- i "$svnrepo/b" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11500
#		git svn rebase &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11501
#		echo a >> b/a &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11502
#		git add b/a &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11503
#		git commit -m- -a &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11504
#		git svn dcommit &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11505
#		! test -d .git/svn/refs/ &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11506
#		test -e .git/svn/git-svn/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11507
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11508
# failed 2 among 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11509
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11510
make[3]: [t9144-git-svn-old-rev_map.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11511
*** t9145-git-svn-master-branch.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11512
ok 1 - setup test repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11513
not ok - 2 git svn clone --stdlayout sets up trunk as master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11514
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11515
#		git svn clone -s "$svnrepo" g &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11516
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11517
#			cd g &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11518
#			test x`git rev-parse --verify refs/remotes/trunk^0` = \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11519
#			     x`git rev-parse --verify refs/heads/master^0`
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11520
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11521
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11522
# failed 1 among 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11523
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11524
make[3]: [t9145-git-svn-master-branch.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11525
*** t9146-git-svn-empty-dirs.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11526
ok 1 - initialize repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11527
not ok - 2 clone
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11528
#	git svn clone "$svnrepo" cloned
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11529
not ok - 3 empty directories exist
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11530
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11531
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11532
#			cd cloned &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11533
#			for i in a b c d d/e d/e/f "weird file name"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11534
#			do
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11535
#				if ! test -d "$i"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11536
#				then
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11537
#					echo >&2 "$i does not exist"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11538
#					exit 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11539
#				fi
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11540
#			done
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11541
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11542
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11543
not ok - 4 option automkdirs set to false
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11544
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11545
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11546
#			git svn init "$svnrepo" cloned-no-mkdirs &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11547
#			cd cloned-no-mkdirs &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11548
#			git config svn-remote.svn.automkdirs false &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11549
#			git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11550
#			for i in a b c d d/e d/e/f "weird file name"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11551
#			do
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11552
#				if test -d "$i"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11553
#				then
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11554
#					echo >&2 "$i exists"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11555
#					exit 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11556
#				fi
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11557
#			done
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11558
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11559
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11560
ok 5 - more emptiness
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11561
not ok - 6 git svn rebase creates empty directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11562
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11563
#		( cd cloned && git svn rebase ) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11564
#		test -d cloned/"! !"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11565
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11566
not ok - 7 git svn mkdirs recreates empty directories
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11567
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11568
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11569
#			cd cloned &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11570
#			rm -r * &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11571
#			git svn mkdirs &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11572
#			for i in a b c d d/e d/e/f "weird file name" "! !"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11573
#			do
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11574
#				if ! test -d "$i"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11575
#				then
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11576
#					echo >&2 "$i does not exist"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11577
#					exit 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11578
#				fi
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11579
#			done
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11580
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11581
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11582
not ok - 8 git svn mkdirs -r works
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11583
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11584
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11585
#			cd cloned &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11586
#			rm -r * &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11587
#			git svn mkdirs -r7 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11588
#			for i in a b c d d/e d/e/f "weird file name"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11589
#			do
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11590
#				if ! test -d "$i"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11591
#				then
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11592
#					echo >&2 "$i does not exist"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11593
#					exit 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11594
#				fi
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11595
#			done
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11596
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11597
#			if test -d "! !"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11598
#			then
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11599
#				echo >&2 "$i should not exist"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11600
#				exit 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11601
#			fi
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11602
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11603
#			git svn mkdirs -r8 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11604
#			if ! test -d "! !"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11605
#			then
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11606
#				echo >&2 "$i not exist"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11607
#				exit 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11608
#			fi
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11609
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11610
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11611
ok 9 - initialize trunk
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11612
not ok - 10 clone trunk
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11613
#	git svn clone -s "$svnrepo" trunk
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11614
not ok - 11 empty directories in trunk exist
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11615
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11616
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11617
#			cd trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11618
#			for i in a "weird file name"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11619
#			do
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11620
#				if ! test -d "$i"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11621
#				then
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11622
#					echo >&2 "$i does not exist"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11623
#					exit 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11624
#				fi
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11625
#			done
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11626
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11627
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11628
ok 12 - remove a top-level directory from svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11629
not ok - 13 removed top-level directory does not exist
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11630
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11631
#		git svn clone "$svnrepo" removed &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11632
#		test ! -e removed/d
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11633
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11634
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11635
ok 14 - git svn gc-ed files work
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11636
# failed 9 among 14 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11637
1..14
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11638
make[3]: [t9146-git-svn-empty-dirs.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11639
*** t9150-svk-mergetickets.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11640
not ok - 1 load svk depot
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11641
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11642
#		svnadmin load -q '$(@D)/t/trash directory.t9150-svk-mergetickets/svnrepo' 	  < '$(@D)/t/t9150/svk-merge.dump' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11643
#		git svn init --minimize-url -R svkmerge 	  --rewrite-root=http://svn.example.org 	  -T trunk -b branches 'file://$(@D)/t/trash directory.t9150-svk-mergetickets/svnrepo' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11644
#		git svn fetch --all
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11645
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11646
fatal: Not a valid object name HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11647
not ok - 2 svk merges were represented coming in
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11648
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11649
#		[ 0 -eq 2 ]
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11650
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11651
# failed 2 among 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11652
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11653
make[3]: [t9150-svk-mergetickets.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11654
*** t9151-svn-mergeinfo.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11655
not ok - 1 load svn dump
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11656
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11657
#		svnadmin load -q '$(@D)/t/trash directory.t9151-svn-mergeinfo/svnrepo' 	  < '$(@D)/t/t9151/svn-mergeinfo.dump' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11658
#		git svn init --minimize-url -R svnmerge 	  --rewrite-root=http://svn.example.org 	  -T trunk -b branches 'file://$(@D)/t/trash directory.t9151-svn-mergeinfo/svnrepo' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11659
#		git svn fetch --all
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11660
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11661
ok 2 - all svn merges became git merge commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11662
ok 3 - cherry picks did not become git merge commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11663
ok 4 - svn non-merge merge commits did not become git merge commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11664
not ok - 5 commit made to merged branch is reachable from the merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11665
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11666
#		before_commit=$(git rev-list --all --grep="trunk commit before merging trunk to b2") &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11667
#		merge_commit=$(git rev-list --all --grep="Merge trunk to b2") &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11668
#		not_reachable=$(git rev-list -1 $before_commit --not $merge_commit) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11669
#		[ -z "$not_reachable" ]
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11670
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11671
not ok - 6 merging two branches in one commit is detected correctly
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11672
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11673
#		f1_commit=$(git rev-list --all --grep="make f1 branch from trunk") &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11674
#		f2_commit=$(git rev-list --all --grep="make f2 branch from trunk") &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11675
#		merge_commit=$(git rev-list --all --grep="Merge f1 and f2 to trunk") &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11676
#		not_reachable=$(git rev-list -1 $f1_commit $f2_commit --not $merge_commit) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11677
#		[ -z "$not_reachable" ]
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11678
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11679
not ok 7 - everything got merged in the end # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11680
# still have 1 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11681
# failed 3 among remaining 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11682
1..7
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11683
make[3]: [t9151-svn-mergeinfo.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11684
*** t9152-svn-empty-dirs-after-gc.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11685
ok 1 - initialize repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11686
not ok - 2 clone
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11687
#	git svn clone "$svnrepo" cloned
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11688
ok 3 - git svn gc runs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11689
not ok - 4 git svn mkdirs recreates empty directories after git svn gc
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11690
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11691
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11692
#			cd cloned &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11693
#			rm -r * &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11694
#			git svn mkdirs &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11695
#			for i in a b c d d/e d/e/f "weird file name"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11696
#			do
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11697
#				if ! test -d "$i"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11698
#				then
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11699
#					echo >&2 "$i does not exist"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11700
#					exit 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11701
#				fi
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11702
#			done
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11703
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11704
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11705
# failed 2 among 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11706
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11707
make[3]: [t9152-svn-empty-dirs-after-gc.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11708
*** t9153-git-svn-rewrite-uuid.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11709
not ok - 1 load svn repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11710
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11711
#		svnadmin load -q '$(@D)/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' < '$(@D)/t/t9153/svn.dump' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11712
#		git svn init --minimize-url --rewrite-uuid='6cc8ada4-5932-4b4a-8242-3534ed8a3232' 'file://$(@D)/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11713
#		git svn fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11714
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11715
not ok - 2 verify uuid
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11716
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11717
#		git cat-file commit refs/remotes/git-svn~0 | 	   grep '^git-svn-id: .*@2 6cc8ada4-5932-4b4a-8242-3534ed8a3232$' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11718
#		git cat-file commit refs/remotes/git-svn~1 | 	   grep '^git-svn-id: .*@1 6cc8ada4-5932-4b4a-8242-3534ed8a3232$'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11719
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11720
# failed 2 among 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11721
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11722
make[3]: [t9153-git-svn-rewrite-uuid.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11723
*** t9154-git-svn-fancy-glob.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11724
not ok - 1 load svn repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11725
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11726
#		svnadmin load -q '$(@D)/t/trash directory.t9154-git-svn-fancy-glob/svnrepo' < '$(@D)/t/t9154/svn.dump' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11727
#		git svn init --minimize-url -T trunk 'file://$(@D)/t/trash directory.t9154-git-svn-fancy-glob/svnrepo' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11728
#		git svn fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11729
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11730
not ok - 2 add red branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11731
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11732
#		git config svn-remote.svn.branches 'branches/{red}:refs/remotes/*' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11733
#		git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11734
#		git rev-parse refs/remotes/red &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11735
#		test_must_fail git rev-parse refs/remotes/green &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11736
#		test_must_fail git rev-parse refs/remotes/blue
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11737
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11738
not ok - 3 add green branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11739
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11740
#		GIT_CONFIG=.git/svn/.metadata git config --unset svn-remote.svn.branches-maxRev &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11741
#		git config svn-remote.svn.branches 'branches/{red,green}:refs/remotes/*' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11742
#		git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11743
#		git rev-parse refs/remotes/red &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11744
#		git rev-parse refs/remotes/green &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11745
#		test_must_fail git rev-parse refs/remotes/blue
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11746
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11747
not ok - 4 add all branches
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11748
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11749
#		GIT_CONFIG=.git/svn/.metadata git config --unset svn-remote.svn.branches-maxRev &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11750
#		git config svn-remote.svn.branches 'branches/*:refs/remotes/*' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11751
#		git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11752
#		git rev-parse refs/remotes/red &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11753
#		git rev-parse refs/remotes/green &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11754
#		git rev-parse refs/remotes/blue
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11755
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11756
# failed 4 among 4 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11757
1..4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11758
make[3]: [t9154-git-svn-fancy-glob.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11759
*** t9155-git-svn-fetch-deleted-tag.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11760
ok 1 - setup svn repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11761
not ok - 2 fetch deleted tags from same revision with checksum error
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11762
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11763
#		git svn init --stdlayout "$svnrepo" git_project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11764
#		cd git_project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11765
#		git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11766
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11767
#		git diff --exit-code mybranch:trunk/subdir/file tags/mytag:file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11768
#		git diff --exit-code master:subdir/file tags/mytag^:file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11769
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11770
# failed 1 among 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11771
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11772
make[3]: [t9155-git-svn-fetch-deleted-tag.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11773
*** t9156-git-svn-fetch-deleted-tag-2.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11774
ok 1 - setup svn repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11775
not ok - 2 fetch deleted tags from same revision with no checksum error
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11776
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11777
#		git svn init --stdlayout "$svnrepo" git_project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11778
#		cd git_project &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11779
#		git svn fetch &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11780
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11781
#		git diff --exit-code master:subdir3/file tags/mytag:file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11782
#		git diff --exit-code master:subdir2/file tags/mytag^:file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11783
#		git diff --exit-code master:subdir1/file tags/mytag^^:file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11784
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11785
# failed 1 among 2 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11786
1..2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11787
make[3]: [t9156-git-svn-fetch-deleted-tag-2.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11788
*** t9157-git-svn-fetch-merge.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11789
ok 1 - initialize source svn repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11790
not ok - 2 clone svn repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11791
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11792
#		git svn init -s "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11793
#		git svn fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11794
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11795
not ok - 3 verify merge commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11796
#	git rev-parse HEAD^2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11797
# failed 2 among 3 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11798
1..3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11799
make[3]: [t9157-git-svn-fetch-merge.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11800
*** t9158-git-svn-mergeinfo.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11801
define NO_SVN_TESTS to skip git svn tests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11802
ok 1 - initialize source svn repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11803
not ok - 2 clone svn repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11804
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11805
#		git svn init "$svnrepo"/trunk &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11806
#		git svn fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11807
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11808
not ok - 3 change svn:mergeinfo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11809
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11810
#		touch bar &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11811
#		git add bar &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11812
#		git commit -m "bar" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11813
#		git svn dcommit --mergeinfo="/branches/foo:1-10"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11814
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11815
not ok - 4 verify svn:mergeinfo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11816
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11817
#		mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11818
#		test "$mergeinfo" = "/branches/foo:1-10"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11819
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11820
not ok - 5 change svn:mergeinfo multiline
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11821
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11822
#		touch baz &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11823
#		git add baz &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11824
#		git commit -m "baz" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11825
#		git svn dcommit --mergeinfo="/branches/bar:1-10 /branches/other:3-5,8,10-11"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11826
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11827
not ok - 6 verify svn:mergeinfo multiline
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11828
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11829
#		mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11830
#		test "$mergeinfo" = "/branches/bar:1-10
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11831
#	/branches/other:3-5,8,10-11"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11832
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11833
# failed 5 among 6 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11834
1..6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11835
make[3]: [t9158-git-svn-mergeinfo.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11836
*** t9159-git-svn-no-parent-mergeinfo.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11837
not ok - 1 test handling of root commits in merge ranges
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11838
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11839
#		mkdir -p init/trunk init/branches init/tags &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11840
#		echo "r1" > init/trunk/file.txt &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11841
#		svn_cmd import -m "initial import" init "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11842
#		svn_cmd co "$svnrepo" tmp &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11843
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11844
#			cd tmp &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11845
#			echo "r2" > trunk/file.txt &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11846
#			svn_cmd commit -m "Modify file.txt on trunk" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11847
#			svn_cmd cp trunk@1 branches/a &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11848
#			svn_cmd commit -m "Create branch a from trunk r1" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11849
#			svn_cmd propset svn:mergeinfo /trunk:1-2 branches/a &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11850
#			svn_cmd commit -m "Fake merge of trunk r2 into branch a" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11851
#			mkdir branches/b &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11852
#			echo "r5" > branches/b/file2.txt &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11853
#			svn_cmd add branches/b &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11854
#			svn_cmd commit -m "Create branch b from thin air" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11855
#			echo "r6" > branches/b/file2.txt &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11856
#			svn_cmd commit -m "Modify file2.txt on branch b" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11857
#			svn_cmd cp branches/b@5 branches/c &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11858
#			svn_cmd commit -m "Create branch c from branch b r5" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11859
#			svn_cmd propset svn:mergeinfo /branches/b:5-6 branches/c &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11860
#			svn_cmd commit -m "Fake merge of branch b r6 into branch c"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11861
#		) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11862
#		git svn init -s "$svnrepo" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11863
#		git svn fetch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11864
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11865
# failed 1 among 1 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11866
1..1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11867
make[3]: [t9159-git-svn-no-parent-mergeinfo.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11868
*** t9160-git-svn-preserve-empty-dirs.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11869
define NO_SVN_TESTS to skip git svn tests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11870
ok 1 - initialize source svn repo containing empty dirs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11871
not ok - 2 clone svn repo with --preserve-empty-dirs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11872
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11873
#		git svn clone "$svnrepo"/trunk --preserve-empty-dirs "$GIT_REPO"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11874
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11875
not ok - 3 directory empty from inception
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11876
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11877
#		test -f "$GIT_REPO"/1/.gitignore &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11878
#		test $(find "$GIT_REPO"/1 -type f | wc -l) = "1"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11879
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11880
not ok - 4 directory empty from subsequent svn commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11881
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11882
#		test -f "$GIT_REPO"/2/.gitignore &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11883
#		test $(find "$GIT_REPO"/2 -type f | wc -l) = "1" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11884
#		test -f "$GIT_REPO"/3/.gitignore &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11885
#		test $(find "$GIT_REPO"/3 -type f | wc -l) = "1"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11886
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11887
not ok - 5 add entry to previously empty directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11888
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11889
#		test $(find "$GIT_REPO"/4 -type f | wc -l) = "1" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11890
#		test -f "$GIT_REPO"/4/a/b/c/foo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11891
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11892
not ok - 6 remove non-last entry from directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11893
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11894
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11895
#			cd "$GIT_REPO" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11896
#			git checkout HEAD~2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11897
#		) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11898
#		test_must_fail test -f "$GIT_REPO"/2/.gitignore &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11899
#		test_must_fail test -f "$GIT_REPO"/3/.gitignore
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11900
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11901
not ok - 7 clone svn repo with --placeholder-file specified
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11902
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11903
#		rm -rf "$GIT_REPO" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11904
#		git svn clone "$svnrepo"/trunk --preserve-empty-dirs \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11905
#			--placeholder-file=.placeholder "$GIT_REPO" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11906
#		find "$GIT_REPO" -type f -name ".placeholder" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11907
#		test $(find "$GIT_REPO" -type f -name ".placeholder" | wc -l) = "5"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11908
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11909
not ok - 8 placeholder namespace conflict with file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11910
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11911
#		test -s "$GIT_REPO"/5/.placeholder
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11912
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11913
not ok - 9 placeholder namespace conflict with directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11914
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11915
#		test -d "$GIT_REPO"/6/.placeholder &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11916
#		test -f "$GIT_REPO"/6/.placeholder/.placeholder &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11917
#		test $(find "$GIT_REPO"/6 -type f | wc -l) = "1"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11918
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11919
not ok - 10 second set of svn commits and rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11920
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11921
#		svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11922
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11923
#			cd "$SVN_TREE" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11924
#			mkdir -p 7 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11925
#			echo "This should remove placeholder" > 1/file1.txt &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11926
#			echo "This should not remove placeholder" > 5/file1.txt &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11927
#			svn_cmd add 7 1/file1.txt 5/file1.txt &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11928
#			svn_cmd commit -m "subsequent svn commit for persistence tests"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11929
#		) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11930
#		rm -rf "$SVN_TREE" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11931
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11932
#			cd "$GIT_REPO" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11933
#			git svn rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11934
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11935
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11936
not ok - 11 flag persistence during subsqeuent rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11937
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11938
#		test -f "$GIT_REPO"/7/.placeholder &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11939
#		test $(find "$GIT_REPO"/7 -type f | wc -l) = "1"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11940
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11941
not ok - 12 placeholder list persistence during subsqeuent rebase
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11942
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11943
#		test -f "$GIT_REPO"/1/file1.txt &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11944
#		test $(find "$GIT_REPO"/1 -type f | wc -l) = "1" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11945
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11946
#		test -f "$GIT_REPO"/5/file1.txt &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11947
#		test -f "$GIT_REPO"/5/.placeholder &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11948
#		test $(find "$GIT_REPO"/5 -type f | wc -l) = "2"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11949
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11950
# failed 11 among 12 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11951
1..12
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11952
make[3]: [t9160-git-svn-preserve-empty-dirs.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11953
*** t9161-git-svn-mergeinfo-push.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11954
not ok - 1 load svn dump
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11955
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11956
#		svnadmin load -q '$(@D)/t/trash directory.t9161-git-svn-mergeinfo-push/svnrepo' 	  < '$(@D)/t/t9161/branches.dump' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11957
#		git svn init --minimize-url -R svnmerge 	  -T trunk -b branches 'file://$(@D)/t/trash directory.t9161-git-svn-mergeinfo-push/svnrepo' &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11958
#		git svn fetch --all
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11959
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11960
not ok - 2 propagate merge information
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11961
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11962
#		git config svn.pushmergeinfo yes &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11963
#		git checkout svnb1 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11964
#		git merge --no-ff svnb2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11965
#		git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11966
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11967
not ok - 3 check svn:mergeinfo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11968
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11969
#		mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11970
#		test "$mergeinfo" = "/branches/svnb2:3,8"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11971
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11972
not ok - 4 merge another branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11973
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11974
#		git merge --no-ff svnb3 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11975
#		git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11976
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11977
not ok - 5 check primary parent mergeinfo respected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11978
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11979
#		mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11980
#		test "$mergeinfo" = "/branches/svnb2:3,8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11981
#	/branches/svnb3:4,9"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11982
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11983
not ok - 6 merge existing merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11984
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11985
#		git merge --no-ff svnb4 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11986
#		git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11987
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11988
not ok - 7 check both parents' mergeinfo respected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11989
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11990
#		mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11991
#		test "$mergeinfo" = "/branches/svnb2:3,8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11992
#	/branches/svnb3:4,9
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11993
#	/branches/svnb4:5-6,10-12
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11994
#	/branches/svnb5:6,11"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11995
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11996
not ok - 8 make further commits to branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11997
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11998
#		git checkout svnb2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 11999
#		touch newb2file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12000
#		git add newb2file &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12001
#		git commit -m "later b2 commit" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12002
#		touch newb2file-2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12003
#		git add newb2file-2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12004
#		git commit -m "later b2 commit 2" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12005
#		git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12006
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12007
not ok - 9 second forward merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12008
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12009
#		git checkout svnb1 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12010
#		git merge --no-ff svnb2 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12011
#		git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12012
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12013
not ok - 10 check new mergeinfo added
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12014
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12015
#		mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12016
#		test "$mergeinfo" = "/branches/svnb2:3,8,16-17
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12017
#	/branches/svnb3:4,9
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12018
#	/branches/svnb4:5-6,10-12
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12019
#	/branches/svnb5:6,11"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12020
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12021
not ok - 11 reintegration merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12022
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12023
#		git checkout svnb4 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12024
#		git merge --no-ff svnb1 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12025
#		git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12026
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12027
not ok - 12 check reintegration mergeinfo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12028
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12029
#		mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb4)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12030
#		test "$mergeinfo" = "/branches/svnb1:2-4,7-9,13-18
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12031
#	/branches/svnb2:3,8,16-17
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12032
#	/branches/svnb3:4,9
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12033
#	/branches/svnb4:5-6,10-12
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12034
#	/branches/svnb5:6,11"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12035
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12036
not ok - 13 dcommit a merge at the top of a stack
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12037
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12038
#		git checkout svnb1 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12039
#		touch anotherfile &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12040
#		git add anotherfile &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12041
#		git commit -m "a commit" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12042
#		git merge svnb4 &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12043
#		git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12044
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12045
# failed 13 among 13 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12046
1..13
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12047
make[3]: [t9161-git-svn-mergeinfo-push.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12048
*** t9162-git-svn-dcommit-interactive.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12049
not ok - 1 initialize repo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12050
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12051
#		svn_cmd mkdir -m"mkdir test-interactive" "$svnrepo/test-interactive" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12052
#		git svn clone "$svnrepo/test-interactive" test-interactive &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12053
#		cd test-interactive &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12054
#		touch foo && git add foo && git commit -m"foo: first commit" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12055
#		git svn dcommit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12056
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12057
not ok - 2 answers: y [
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12058
] yes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12059
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12060
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12061
#			echo "change #1" >> foo && git commit -a -m"change #1" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12062
#			echo "change #2" >> foo && git commit -a -m"change #2" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12063
#			echo "change #3" >> foo && git commit -a -m"change #3" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12064
#			( echo "y
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12065
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12066
#	y" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12067
#			test $(git rev-parse HEAD) = $(git rev-parse remotes/git-svn)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12068
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12069
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12070
not ok - 3 answers: yes yes no
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12071
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12072
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12073
#			echo "change #1" >> foo && git commit -a -m"change #1" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12074
#			echo "change #2" >> foo && git commit -a -m"change #2" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12075
#			echo "change #3" >> foo && git commit -a -m"change #3" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12076
#			( echo "yes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12077
#	yes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12078
#	no" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12079
#			test $(git rev-parse HEAD^^^) = $(git rev-parse remotes/git-svn) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12080
#			git reset --hard remotes/git-svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12081
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12082
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12083
not ok - 4 answers: yes quit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12084
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12085
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12086
#			echo "change #1" >> foo && git commit -a -m"change #1" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12087
#			echo "change #2" >> foo && git commit -a -m"change #2" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12088
#			echo "change #3" >> foo && git commit -a -m"change #3" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12089
#			( echo "yes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12090
#	quit" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12091
#			test $(git rev-parse HEAD^^^) = $(git rev-parse remotes/git-svn) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12092
#			git reset --hard remotes/git-svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12093
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12094
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12095
not ok - 5 answers: all
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12096
#	
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12097
#		(
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12098
#			echo "change #1" >> foo && git commit -a -m"change #1" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12099
#			echo "change #2" >> foo && git commit -a -m"change #2" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12100
#			echo "change #3" >> foo && git commit -a -m"change #3" &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12101
#			( echo "all" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12102
#			test $(git rev-parse HEAD) = $(git rev-parse remotes/git-svn) &&
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12103
#			git reset --hard remotes/git-svn
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12104
#		)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12105
#		
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12106
# failed 5 among 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12107
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12108
make[3]: [t9162-git-svn-dcommit-interactive.sh] Error 1 (ignored)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12109
*** t9200-git-cvsexportcommit.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12110
ok 1 - New file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12111
ok 2 - Remove two files, add two and update two
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12112
ok 3 - Fail to change binary more than one generation old
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12113
ok 4 - Remove only binary files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12114
ok 5 - Remove only a text file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12115
ok 6 - New file with spaces in file name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12116
ok 7 - Update file with spaces in file name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12117
ok 8 - File with non-ascii file name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12118
ok 9 - Mismatching patch should fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12119
ok 10 - Retain execute bit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12120
ok 11 - -w option should work with relative GIT_DIR
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12121
ok 12 - check files before directories
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12122
ok 13 - re-commit a removed filename which remains in CVS attic
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12123
ok 14 - commit a file with leading spaces in the name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12124
ok 15 - use the same checkout for Git and CVS
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12125
# passed all 15 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12126
1..15
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12127
*** t9300-fast-import.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12128
ok 1 - setup: have pipes?
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12129
ok 2 - empty stream succeeds
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12130
ok 3 - A: create pack from stdin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12131
ok 4 - A: verify pack
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12132
ok 5 - A: verify commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12133
ok 6 - A: verify tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12134
ok 7 - A: verify file2
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12135
ok 8 - A: verify file3
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12136
ok 9 - A: verify file4
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12137
ok 10 - A: verify tag/series-A
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12138
ok 11 - A: verify tag/series-A-blob
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12139
ok 12 - A: verify marks output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12140
ok 13 - A: verify marks import
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12141
ok 14 - A: tag blob by sha1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12142
ok 15 - A: verify marks import does not crash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12143
ok 16 - A: verify pack
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12144
ok 17 - A: verify diff
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12145
ok 18 - A: export marks with large values
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12146
ok 19 - B: fail on invalid blob sha1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12147
ok 20 - B: fail on invalid branch name ".badbranchname"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12148
ok 21 - B: fail on invalid branch name "bad[branch]name"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12149
ok 22 - B: accept branch name "TEMP_TAG"
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12150
ok 23 - B: accept empty committer
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12151
ok 24 - B: accept and fixup committer with no name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12152
ok 25 - B: fail on invalid committer (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12153
ok 26 - B: fail on invalid committer (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12154
ok 27 - B: fail on invalid committer (3)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12155
ok 28 - B: fail on invalid committer (4)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12156
ok 29 - B: fail on invalid committer (5)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12157
ok 30 - C: incremental import create pack from stdin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12158
ok 31 - C: verify pack
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12159
ok 32 - C: validate reuse existing blob
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12160
ok 33 - C: verify commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12161
ok 34 - C: validate rename result
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12162
ok 35 - D: inline data in commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12163
ok 36 - D: verify pack
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12164
ok 37 - D: validate new files added
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12165
ok 38 - D: verify file5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12166
ok 39 - D: verify file6
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12167
ok 40 - E: rfc2822 date, --date-format=raw
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12168
ok 41 - E: rfc2822 date, --date-format=rfc2822
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12169
ok 42 - E: verify pack
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12170
ok 43 - E: verify commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12171
ok 44 - F: non-fast-forward update skips
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12172
ok 45 - F: verify pack
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12173
ok 46 - F: verify other commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12174
ok 47 - G: non-fast-forward update forced
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12175
ok 48 - G: verify pack
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12176
ok 49 - G: branch changed, but logged
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12177
ok 50 - H: deletall, add 1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12178
ok 51 - H: verify pack
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12179
ok 52 - H: validate old files removed, new files added
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12180
ok 53 - H: verify file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12181
ok 54 - I: export-pack-edges
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12182
ok 55 - I: verify edge list
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12183
ok 56 - J: reset existing branch creates empty commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12184
ok 57 - J: branch has 1 commit, empty tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12185
ok 58 - J: tag must fail on empty branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12186
ok 59 - K: reinit branch with from
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12187
ok 60 - K: verify K^1 = branch^1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12188
ok 61 - L: verify internal tree sorting
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12189
ok 62 - L: nested tree copy does not corrupt deltas
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12190
ok 63 - M: rename file in same subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12191
ok 64 - M: rename file to new subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12192
ok 65 - M: rename subdirectory to new subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12193
ok 66 - N: copy file in same subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12194
ok 67 - N: copy then modify subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12195
ok 68 - N: copy dirty subdirectory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12196
ok 69 - N: copy directory by id
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12197
ok 70 - N: read and copy directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12198
ok 71 - N: empty directory reads as missing
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12199
ok 72 - N: copy root directory by tree hash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12200
ok 73 - N: delete directory by copying
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12201
ok 74 - N: modify copied tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12202
ok 75 - N: reject foo/ syntax
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12203
ok 76 - N: copy to root by id and modify
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12204
ok 77 - N: extract subtree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12205
ok 78 - N: modify subtree, extract it, and modify again
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12206
ok 79 - O: comments are all skipped
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12207
ok 80 - O: blank lines not necessary after data commands
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12208
ok 81 - O: repack before next test
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12209
ok 82 - O: blank lines not necessary after other commands
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12210
ok 83 - O: progress outputs as requested by input
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12211
ok 84 - P: supermodule & submodule mix
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12212
ok 85 - P: verbatim SHA gitlinks
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12213
ok 86 - P: fail on inline gitlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12214
ok 87 - P: fail on blob mark in gitlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12215
ok 88 - Q: commit notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12216
ok 89 - Q: verify pack
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12217
ok 90 - Q: verify first commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12218
ok 91 - Q: verify second commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12219
ok 92 - Q: verify third commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12220
ok 93 - Q: verify first notes commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12221
ok 94 - Q: verify first notes tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12222
ok 95 - Q: verify first note for first commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12223
ok 96 - Q: verify first note for second commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12224
ok 97 - Q: verify first note for third commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12225
ok 98 - Q: verify second notes commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12226
ok 99 - Q: verify second notes tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12227
ok 100 - Q: verify second note for first commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12228
ok 101 - Q: verify first note for second commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12229
ok 102 - Q: verify first note for third commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12230
ok 103 - Q: verify third notes commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12231
ok 104 - Q: verify third notes tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12232
ok 105 - Q: verify third note for first commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12233
ok 106 - Q: verify fourth notes commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12234
ok 107 - Q: verify fourth notes tree
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12235
ok 108 - Q: verify second note for second commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12236
ok 109 - Q: deny note on empty branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12237
ok 110 - R: abort on unsupported feature
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12238
ok 111 - R: supported feature is accepted
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12239
ok 112 - R: abort on receiving feature after data command
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12240
ok 113 - R: only one import-marks feature allowed per stream
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12241
ok 114 - R: export-marks feature results in a marks file being created
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12242
ok 115 - R: export-marks options can be overriden by commandline options
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12243
ok 116 - R: catch typo in marks file name
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12244
ok 117 - R: import and output marks can be the same file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12245
ok 118 - R: --import-marks=foo --output-marks=foo to create foo fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12246
ok 119 - R: --import-marks-if-exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12247
ok 120 - R: feature import-marks-if-exists
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12248
ok 121 - R: import to output marks works without any content
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12249
ok 122 - R: import marks prefers commandline marks file over the stream
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12250
ok 123 - R: multiple --import-marks= should be honoured
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12251
ok 124 - R: feature relative-marks should be honoured
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12252
ok 125 - R: feature no-relative-marks should be honoured
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12253
ok 126 - R: feature ls supported
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12254
ok 127 - R: feature cat-blob supported
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12255
ok 128 - R: cat-blob-fd must be a nonnegative integer
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12256
ok 129 - R: print old blob
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12257
ok 130 - R: in-stream cat-blob-fd not respected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12258
ok 131 - R: print new blob
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12259
ok 132 - R: print new blob by sha1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12260
ok 133 - setup: big file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12261
ok 134 - R: print two blobs to stdout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12262
ok 135 - R: copy using cat-file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12263
ok 136 - R: print blob mid-commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12264
ok 137 - R: print staged blob within commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12265
ok 138 - R: quiet option results in no stats being output
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12266
ok 139 - R: feature done means terminating "done" is mandatory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12267
ok 140 - R: terminating "done" with trailing gibberish is ok
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12268
ok 141 - R: terminating "done" within commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12269
ok 142 - R: die on unknown option
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12270
ok 143 - R: unknown commandline options are rejected
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12271
ok 144 - R: die on invalid option argument
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12272
ok 145 - R: ignore non-git options
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12273
ok 146 - R: blob bigger than threshold
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12274
ok 147 - R: verify created pack
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12275
ok 148 - R: verify written objects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12276
ok 149 - R: blob appears only once
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12277
# passed all 149 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12278
1..149
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12279
*** t9301-fast-import-notes.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12280
ok 1 - set up master branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12281
ok 2 - add notes with simple M command
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12282
ok 3 - add notes with simple N command
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12283
ok 4 - update existing notes with N command
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12284
ok 5 - add concatentation notes with M command
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12285
ok 6 - verify that deleteall also removes notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12286
ok 7 - verify that later N commands override earlier M commands
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12287
ok 8 - add lots of commits and notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12288
ok 9 - verify that lots of notes trigger a fanout scheme
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12289
ok 10 - verify that non-notes are untouched by a fanout change
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12290
ok 11 - change a few existing notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12291
ok 12 - verify that changing notes respect existing fanout
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12292
ok 13 - remove lots of notes
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12293
ok 14 - verify that removing notes trigger fanout consolidation
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12294
ok 15 - verify that non-notes are untouched by a fanout change
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12295
ok 16 - add notes to 16 commits in each of 10 refs
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12296
# passed all 16 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12297
1..16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12298
*** t9350-fast-export.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12299
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12300
ok 2 - fast-export | fast-import
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12301
ok 3 - fast-export master~2..master
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12302
ok 4 - iso-8859-1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12303
ok 5 - import/export-marks
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12304
ok 6 - set up faked signed tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12305
ok 7 - signed-tags=abort
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12306
ok 8 - signed-tags=verbatim
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12307
ok 9 - signed-tags=strip
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12308
ok 10 - setup submodule
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12309
ok 11 - submodule fast-export | fast-import
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12310
ok 12 - setup copies
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12311
ok 13 - fast-export -C -C | fast-import
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12312
ok 14 - fast-export | fast-import when master is tagged
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12313
ok 15 - cope with tagger-less tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12314
ok 16 - setup for limiting exports by PATH
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12315
ok 17 - dropping tag of filtered out object
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12316
ok 18 - rewriting tag of filtered out object
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12317
not ok 19 - no exact-ref revisions included # TODO known breakage
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12318
ok 20 - path limiting with import-marks does not lose unmodified files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12319
ok 21 - full-tree re-shows unmodified files
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12320
ok 22 - set-up a few more tags for tag export tests
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12321
ok 23 - tree_tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12322
ok 24 - tree_tag-obj
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12323
ok 25 - tag-obj_tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12324
ok 26 - tag-obj_tag-obj
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12325
ok 27 - directory becomes symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12326
ok 28 - fast-export quotes pathnames
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12327
# still have 1 known breakage(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12328
# passed all remaining 27 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12329
1..28
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12330
*** t9400-git-cvsserver-server.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12331
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12332
1..0 # SKIP skipping git-cvsserver tests, Perl SQLite interface unavailable
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12333
*** t9401-git-cvsserver-crlf.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12334
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12335
1..0 # SKIP skipping git-cvsserver tests, Perl SQLite interface unavailable
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12336
*** t9500-gitweb-standalone-no-errors.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12337
ok 1 - no commits: projects_list (implicit)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12338
ok 2 - no commits: projects_index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12339
ok 3 - no commits: .git summary (implicit)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12340
ok 4 - no commits: .git commit (implicit HEAD)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12341
ok 5 - no commits: .git commitdiff (implicit HEAD)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12342
ok 6 - no commits: .git tree (implicit HEAD)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12343
ok 7 - no commits: .git heads
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12344
ok 8 - no commits: .git tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12345
ok 9 - Make initial commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12346
ok 10 - projects_list (implicit)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12347
ok 11 - projects_index
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12348
ok 12 - .git summary (implicit)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12349
ok 13 - .git commit (implicit HEAD)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12350
ok 14 - .git commitdiff (implicit HEAD, root commit)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12351
ok 15 - .git commitdiff_plain (implicit HEAD, root commit)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12352
ok 16 - .git commit (HEAD)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12353
ok 17 - .git tree (implicit HEAD)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12354
ok 18 - .git blob (file)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12355
ok 19 - .git blob_plain (file)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12356
ok 20 - .git commit (non-existent)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12357
ok 21 - .git commitdiff (non-existent)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12358
ok 22 - .git commitdiff (non-existent vs HEAD)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12359
ok 23 - .git tree (0000000000000000000000000000000000000000)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12360
ok 24 - .git tag (0000000000000000000000000000000000000000)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12361
ok 25 - .git blob (non-existent)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12362
ok 26 - .git blob_plain (non-existent)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12363
ok 27 - commitdiff(0): root
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12364
ok 28 - commitdiff(0): file added
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12365
ok 29 - commitdiff(0): mode change
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12366
ok 30 - commitdiff(0): file renamed
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12367
ok 31 - commitdiff(0): file to symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12368
ok 32 - commitdiff(0): file deleted
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12369
ok 33 - commitdiff(0): file copied / new file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12370
ok 34 - commitdiff(0): mode change and modified
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12371
ok 35 - commitdiff(0): renamed and modified
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12372
ok 36 - commitdiff(0): renamed, mode change and modified
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12373
ok 37 - setup typechange commits
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12374
ok 38 - commitdiff(2): file renamed from foo to foo/baz
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12375
ok 39 - commitdiff(2): file renamed from foo/baz to foo
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12376
ok 40 - commitdiff(2): directory becomes file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12377
ok 41 - commitdiff(2): file becomes directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12378
ok 42 - commitdiff(2): file becomes symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12379
ok 43 - commitdiff(2): symlink becomes file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12380
ok 44 - commitdiff(2): symlink becomes directory
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12381
ok 45 - commitdiff(2): directory becomes symlink
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12382
ok 46 - setup incomplete lines
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12383
ok 47 - commitdiff(1): addition of incomplete line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12384
ok 48 - commitdiff(1): incomplete line as context line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12385
ok 49 - commitdiff(1): change incomplete line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12386
ok 50 - commitdiff(1): removal of incomplete line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12387
ok 51 - Create a merge
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12388
ok 52 - commit(0): merge commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12389
ok 53 - commitdiff(0): merge commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12390
ok 54 - Prepare large commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12391
ok 55 - commit(1): large commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12392
ok 56 - commitdiff(1): large commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12393
ok 57 - side-by-side: addition of incomplete line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12394
ok 58 - side-by-side: incomplete line as context line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12395
ok 59 - side-by-side: changed incomplete line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12396
ok 60 - side-by-side: removal of incomplete line
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12397
ok 61 - side-by-side: merge commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12398
ok 62 - tags: list of different types of tags
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12399
ok 63 - tag: Tag to commit object
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12400
ok 64 - tag: on lightweight tag (invalid)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12401
ok 65 - logs: log (implicit HEAD)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12402
ok 66 - logs: shortlog (implicit HEAD)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12403
ok 67 - logs: history (implicit HEAD, file)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12404
ok 68 - logs: history (implicit HEAD, non-existent file)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12405
ok 69 - logs: history (implicit HEAD, deleted file)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12406
ok 70 - path_info: project
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12407
ok 71 - path_info: project/branch
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12408
ok 72 - path_info: project/branch:file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12409
ok 73 - path_info: project/branch:dir/
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12410
ok 74 - path_info: project/branch:file (non-existent)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12411
ok 75 - path_info: project/branch:dir/ (non-existent)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12412
ok 76 - path_info: project/branch:/file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12413
ok 77 - path_info: project/:/file (implicit HEAD)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12414
ok 78 - path_info: project/:/ (implicit HEAD, top tree)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12415
ok 79 - feeds: OPML
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12416
ok 80 - feed: RSS
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12417
ok 81 - feed: Atom
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12418
ok 82 - encode(commit): utf8
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12419
ok 83 - encode(commit): iso-8859-1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12420
ok 84 - encode(log): utf-8 and iso-8859-1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12421
ok 85 - opt: log --no-merges
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12422
ok 86 - opt: atom --no-merges
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12423
ok 87 - opt: "file" history --no-merges
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12424
ok 88 - opt: log --no-such-option (invalid option)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12425
ok 89 - opt: tree --no-merges (invalid option for action)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12426
ok 90 - URL: no project URLs, no base URL
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12427
ok 91 - URL: project URLs via gitweb.url
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12428
ok 92 - URL: project URLs via cloneurl file
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12429
ok 93 - config override: projects list (implicit)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12430
ok 94 - config override: tree view, features not overridden in repo config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12431
ok 95 - config override: tree view, features disabled in repo config
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12432
ok 96 - config override: tree view, features enabled in repo config (1)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12433
ok 97 - config override: tree view, features enabled in repo config (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12434
ok 98 - search: preparation
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12435
ok 99 - search: commit author
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12436
ok 100 - search: commit message
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12437
ok 101 - search: grep
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12438
ok 102 - search: pickaxe
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12439
ok 103 - search: projects
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12440
ok 104 - README.html with non-ASCII characters (utf-8)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12441
Skipping syntax highlighting test, because 'highlight' was not found
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12442
ok 105 # skip syntax highlighting (no highlight, unknown syntax) (missing HIGHLIGHT)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12443
ok 106 # skip syntax highlighting (highlighted, shell script) (missing HIGHLIGHT)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12444
ok 107 - forks: prepare
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12445
ok 108 - forks: projects list
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12446
ok 109 - forks: forks action
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12447
ok 110 - ctags: tag cloud in projects list
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12448
ok 111 - ctags: search projects by existing tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12449
ok 112 - ctags: search projects by non existent tag
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12450
ok 113 - ctags: malformed tag weights
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12451
ok 114 - categories: projects list, only default category
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12452
# passed all 114 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12453
1..114
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12454
*** t9501-gitweb-standalone-http-status.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12455
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12456
ok 2 - snapshots: tgz only default format enabled
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12457
ok 3 - snapshots: all enabled in default, use default disabled value
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12458
ok 4 - snapshots: zip explicitly disabled
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12459
ok 5 - snapshots: tgz explicitly enabled
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12460
ok 6 - snapshots: good tree-ish id
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12461
ok 7 - snapshots: bad tree-ish id
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12462
ok 8 - snapshots: bad tree-ish id (tagged object)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12463
ok 9 - snapshots: good object id
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12464
ok 10 - snapshots: bad object id
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12465
ok 11 - load checking: load too high (default action)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12466
# passed all 11 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12467
1..11
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12468
*** t9502-gitweb-standalone-parse-output.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12469
ok 1 - setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12470
ok 2 - snapshot: full sha1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12471
ok 3 - snapshot: shortened sha1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12472
ok 4 - snapshot: almost full sha1
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12473
ok 5 - snapshot: HEAD
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12474
ok 6 - snapshot: short branch name (master)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12475
ok 7 - snapshot: short tag name (first)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12476
ok 8 - snapshot: full branch name (refs/heads/master)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12477
ok 9 - snapshot: full tag name (refs/tags/first)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12478
ok 10 - snapshot: hierarchical branch name (xx/test)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12479
ok 11 - forks: setup
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12480
ok 12 - forks: not skipped unless "forks" feature enabled
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12481
ok 13 - forks: forks skipped if "forks" feature enabled
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12482
ok 14 - forks: "forks" action for forked repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12483
ok 15 - forks: can access forked repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12484
ok 16 - forks: project_index lists all projects (incl. forks)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12485
# passed all 16 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12486
1..16
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12487
*** t9600-cvsimport.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12488
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12489
1..0 # SKIP skipping cvsimport tests, cvsps not found
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12490
*** t9601-cvsimport-vendor-branch.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12491
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12492
1..0 # SKIP skipping cvsimport tests, cvsps not found
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12493
*** t9602-cvsimport-branches-tags.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12494
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12495
1..0 # SKIP skipping cvsimport tests, cvsps not found
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12496
*** t9603-cvsimport-patchsets.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12497
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12498
1..0 # SKIP skipping cvsimport tests, cvsps not found
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12499
*** t9700-perl-git.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12500
ok 1 - set up test repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12501
# run 2: Perl API ($(PERL) $(@D)/t/t9700/test.pl)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12502
ok 2 - use Git;
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12503
ok 3 - open repository
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12504
ok 4 - config scalar: string
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12505
ok 5 - config array: string
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12506
ok 6 - config scalar: nonexistent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12507
ok 7 - config array: nonexistent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12508
ok 8 - config_int: integer
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12509
ok 9 - config_int: nonexistent
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12510
ok 10 - config_bool: true
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12511
ok 11 - config_bool: false
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12512
ok 12 - config_path: ~/foo expansion
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12513
ok 13 - config_path: multiple values
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12514
ok 14 - get_color
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12515
ok 15 - config: duplicate entry in scalar context fails
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12516
ok 16 - config_bool: non-boolean values fail
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12517
ok 17 - ident scalar: author (type)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12518
ok 18 - ident scalar: committer (type)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12519
ok 19 - ident scalar: invalid ident string (no parsing)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12520
ok 20 - ident array: author
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12521
ok 21 - ident array: author
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12522
ok 22 - ident array: ident string
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12523
ok 23 - ident array: invalid ident string
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12524
ok 24 - ident_person: author (type)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12525
ok 25 - ident_person: ident string
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12526
ok 26 - ident_person: array
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12527
ok 27 - (get file hash)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12528
ok 28 - cat_blob: size
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12529
ok 29 - cat_blob: data
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12530
ok 30 - hash_object: roundtrip
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12531
ok 31 - hash_and_insert_object: returns hash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12532
ok 32 - cat_blob: roundtrip size
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12533
ok 33 - cat_blob: roundtrip data
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12534
ok 34 - repo_path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12535
ok 35 - wc_path
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12536
ok 36 - wc_subdir initial
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12537
ok 37 - wc_subdir after wc_chdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12538
ok 38 - config after wc_chdir
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12539
ok 39 - repo_path (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12540
ok 40 - wc_path (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12541
ok 41 - wc_subdir initial (2)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12542
ok 42 - rev-parse returned hash
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12543
ok 43 - log . does not show last commit
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12544
ok 44 - cat_blob(outside): size
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12545
1..44
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12546
# test_external test Perl API was ok
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12547
# test_external_without_stderr test no stderr: Perl API was ok
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12548
*** t9800-git-p4-basic.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12549
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12550
1..0 # SKIP skipping git-p4 tests; no p4 or p4d
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12551
*** t9801-git-p4-branch.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12552
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12553
1..0 # SKIP skipping git-p4 tests; no p4 or p4d
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12554
*** t9802-git-p4-filetype.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12555
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12556
1..0 # SKIP skipping git-p4 tests; no p4 or p4d
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12557
*** t9803-git-p4-shell-metachars.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12558
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12559
1..0 # SKIP skipping git-p4 tests; no p4 or p4d
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12560
*** t9805-git-p4-skip-submit-edit.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12561
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12562
1..0 # SKIP skipping git-p4 tests; no p4 or p4d
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12563
*** t9806-git-p4-options.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12564
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12565
1..0 # SKIP skipping git-p4 tests; no p4 or p4d
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12566
*** t9807-git-p4-submit.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12567
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12568
1..0 # SKIP skipping git-p4 tests; no p4 or p4d
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12569
*** t9808-git-p4-chdir.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12570
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12571
1..0 # SKIP skipping git-p4 tests; no p4 or p4d
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12572
*** t9809-git-p4-client-view.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12573
# passed all 0 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12574
1..0 # SKIP skipping git-p4 tests; no p4 or p4d
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12575
*** t9901-git-web--browse.sh ***
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12576
ok 1 - URL with an ampersand in it
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12577
ok 2 - URL with a semi-colon in it
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12578
ok 3 - URL with a hash in it
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12579
ok 4 - browser paths are properly quoted
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12580
ok 5 - browser command allows arbitrary shell code
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12581
# passed all 5 test(s)
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12582
1..5
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12583
/usr/gnu/bin/make aggregate-results
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12584
make[4]: Entering directory `$(@D)/t'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12585
for f in test-results/t*-*.counts; do \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12586
	echo "$f"; \
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12587
done | '/bin/bash' ./aggregate-results.sh
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12588
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12589
failed test(s): t0202 t0204 t7406 t9100 t9101 t9102 t9103 t9104 t9105 t9106 t9107 t9108 t9109 t9110 t9111 t9112 t9114 t9115 t9116 t9117 t9118 t9120 t9121 t9122 t9123 t9124 t9125 t9127 t9128 t9129 t9130 t9131 t9132 t9133 t9134 t9135 t9136 t9137 t9138 t9139 t9140 t9141 t9142 t9143 t9144 t9145 t9146 t9150 t9151 t9152 t9153 t9154 t9155 t9156 t9157 t9158 t9159 t9160 t9161 t9162
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12590
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12591
fixed   0
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12592
success 7760
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12593
failed  290
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12594
broken  46
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12595
total   8274
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12596
make[4]: Leaving directory `$(@D)/t'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12597
/usr/gnu/bin/make clean
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12598
make[4]: Entering directory `$(@D)/t'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12599
rm -f -r 'trash directory'.* test-results
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12600
rm -f -r valgrind/bin
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12601
rm -f .prove
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12602
make[4]: Leaving directory `$(@D)/t'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12603
make[3]: Leaving directory `$(@D)/t'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12604
make[2]: Leaving directory `$(@D)/t'
253de46fd78c 20761309 problem in UTILITY/GIT
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff changeset
 12605
make[1]: Leaving directory `$(@D)'