projects / packages / git-core.git / blame
| Commit | Line | Data |
|---|---|---|
| 22105a2f JP |
1 | diff -ur git-2.12.1.orig/t/t5615-alternate-env.sh git-2.12.1/t/t5615-alternate-env.sh |
| 2 | --- git-2.12.1.orig/t/t5615-alternate-env.sh 2017-03-22 18:52:45.344354935 +0100 | |
| 3 | +++ git-2.12.1/t/t5615-alternate-env.sh 2017-03-22 18:52:59.320917887 +0100 | |
| 4 | @@ -77,6 +77,7 @@ | |
| 5 | check_obj "$quoted:$unquoted" <<-EOF | |
| 6 | $one blob | |
| 7 | $two blob | |
| 8 | + EOF | |
| 9 | ' | |
| 10 | ||
| 11 | test_expect_success !MINGW 'broken quoting falls back to interpreting raw' ' | |
| 12 | diff -ur git-2.12.1.orig/t/t7004-tag.sh git-2.12.1/t/t7004-tag.sh | |
| 13 | --- git-2.12.1.orig/t/t7004-tag.sh 2017-03-22 18:52:45.347688243 +0100 | |
| 14 | +++ git-2.12.1/t/t7004-tag.sh 2017-03-22 18:53:28.757366131 +0100 | |
| 15 | @@ -880,21 +880,13 @@ | |
| 16 | ' | |
| 17 | ||
| 18 | test_expect_success 'verifying a proper tag with --format pass and format accordingly' ' | |
| 19 | - cat >expect <<-\EOF | |
| 20 | + cat >expect <<-\EOF && | |
| 21 | tagname : signed-tag | |
| 22 | - EOF && | |
| 23 | + EOF | |
| 24 | git tag -v --format="tagname : %(tag)" "signed-tag" >actual && | |
| 25 | test_cmp expect actual | |
| 26 | ' | |
| 27 | ||
| 28 | -test_expect_success 'verifying a forged tag with --format fail and format accordingly' ' | |
| 29 | - cat >expect <<-\EOF | |
| 30 | - tagname : forged-tag | |
| 31 | - EOF && | |
| 32 | - test_must_fail git tag -v --format="tagname : %(tag)" "forged-tag" >actual && | |
| 33 | - test_cmp expect actual | |
| 34 | -' | |
| 35 | - | |
| 36 | # blank and empty messages for signed tags: | |
| 37 | ||
| 38 | get_tag_header empty-signed-tag $commit commit $time >expect | |
| 39 | --- git-2.12.1.orig/t/t7030-verify-tag.sh 2017-03-22 18:52:45.347688243 +0100 | |
| 40 | +++ git-2.12.1/t/t7030-verify-tag.sh 2017-03-22 19:06:41.894375653 +0100 | |
| 41 | @@ -126,19 +126,11 @@ | |
| 42 | ' | |
| 43 | ||
| 44 | test_expect_success 'verifying tag with --format' ' | |
| 45 | - cat >expect <<-\EOF | |
| 46 | + cat >expect <<-\EOF && | |
| 47 | tagname : fourth-signed | |
| 48 | - EOF && | |
| 49 | + EOF | |
| 50 | git verify-tag --format="tagname : %(tag)" "fourth-signed" >actual && | |
| 51 | test_cmp expect actual | |
| 52 | ' | |
| 53 | ||
| 54 | -test_expect_success 'verifying a forged tag with --format fail and format accordingly' ' | |
| 55 | - cat >expect <<-\EOF | |
| 56 | - tagname : 7th forged-signed | |
| 57 | - EOF && | |
| 58 | - test_must_fail git verify-tag --format="tagname : %(tag)" $(cat forged1.tag) >actual-forged && | |
| 59 | - test_cmp expect actual-forged | |
| 60 | -' | |
| 61 | - | |
| 62 | test_done | |
| 63 | --- git-2.12.1.orig/t/t7406-submodule-update.sh 2017-03-22 18:52:45.347688243 +0100 | |
| 64 | +++ git-2.12.1/t/t7406-submodule-update.sh 2017-03-22 19:16:48.043071963 +0100 | |
| 65 | @@ -440,17 +440,6 @@ | |
| 66 | ) && | |
| 67 | test_i18ncmp actual expect | |
| 68 | ' | |
| 69 | - | |
| 70 | -test_expect_success 'submodule update - command run for initial population of submodule' ' | |
| 71 | - cat <<-\ EOF >expect | |
| 72 | - Execution of '\''false $submodulesha1'\'' failed in submodule path '\''submodule'\'' | |
| 73 | - EOF && | |
| 74 | - rm -rf super/submodule && | |
| 75 | - test_must_fail git -C super submodule update >../actual && | |
| 76 | - test_cmp expect actual && | |
| 77 | - git -C super submodule update --checkout | |
| 78 | -' | |
| 79 | - | |
| 80 | cat << EOF >expect | |
| 81 | Execution of 'false $submodulesha1' failed in submodule path '../super/submodule' | |
| 82 | Failed to recurse into submodule path '../super' |