diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-09-30 13:19:30 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-30 13:19:30 +0900 |
| commit | d693345518e9d5145902ec001a364ccdec8e148b (patch) | |
| tree | b978cd237fbabe3459ce986ecb2378dafe1259c1 /t/t1507-rev-parse-upstream.sh | |
| parent | Merge branch 'jk/misc-uninitialized-fixes' (diff) | |
| parent | t: use common $SQ variable (diff) | |
| download | tgif-d693345518e9d5145902ec001a364ccdec8e148b.tar.xz | |
Merge branch 'dl/use-sq-from-test-lib'
Code cleanup.
* dl/use-sq-from-test-lib:
t: use common $SQ variable
Diffstat (limited to 't/t1507-rev-parse-upstream.sh')
| -rwxr-xr-x | t/t1507-rev-parse-upstream.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh index fa3e499641..8b4cf8a6e3 100755 --- a/t/t1507-rev-parse-upstream.sh +++ b/t/t1507-rev-parse-upstream.sh @@ -28,8 +28,6 @@ test_expect_success 'setup' ' ) ' -sq="'" - full_name () { (cd clone && git rev-parse --symbolic-full-name "$@") @@ -129,7 +127,7 @@ test_expect_success 'merge my-side@{u} records the correct name' ' git branch -t new my-side@{u} && git merge -s ours new@{u} && git show -s --pretty=tformat:%s >actual && - echo "Merge remote-tracking branch ${sq}origin/side${sq}" >expect && + echo "Merge remote-tracking branch ${SQ}origin/side${SQ}" >expect && test_cmp expect actual ) ' @@ -156,7 +154,7 @@ test_expect_success 'branch@{u} works when tracking a local branch' ' test_expect_success 'branch@{u} error message when no upstream' ' cat >expect <<-EOF && - fatal: no upstream configured for branch ${sq}non-tracking${sq} + fatal: no upstream configured for branch ${SQ}non-tracking${SQ} EOF error_message non-tracking@{u} && test_i18ncmp expect error @@ -164,7 +162,7 @@ test_expect_success 'branch@{u} error message when no upstream' ' test_expect_success '@{u} error message when no upstream' ' cat >expect <<-EOF && - fatal: no upstream configured for branch ${sq}master${sq} + fatal: no upstream configured for branch ${SQ}master${SQ} EOF test_must_fail git rev-parse --verify @{u} 2>actual && test_i18ncmp expect actual @@ -172,7 +170,7 @@ test_expect_success '@{u} error message when no upstream' ' test_expect_success 'branch@{u} error message with misspelt branch' ' cat >expect <<-EOF && - fatal: no such branch: ${sq}no-such-branch${sq} + fatal: no such branch: ${SQ}no-such-branch${SQ} EOF error_message no-such-branch@{u} && test_i18ncmp expect error @@ -189,7 +187,7 @@ test_expect_success '@{u} error message when not on a branch' ' test_expect_success 'branch@{u} error message if upstream branch not fetched' ' cat >expect <<-EOF && - fatal: upstream branch ${sq}refs/heads/side${sq} not stored as a remote-tracking branch + fatal: upstream branch ${SQ}refs/heads/side${SQ} not stored as a remote-tracking branch EOF error_message bad-upstream@{u} && test_i18ncmp expect error |