From 90cde840c6228f0bc08750f7850663734fa4f4d9 Mon Sep 17 00:00:00 2001 From: Peter Grayson Date: Mon, 21 Jun 2021 11:04:06 -0400 Subject: [PATCH] Normalize StGit and Git spellings Replace occurrences of "StGIT" with the preferred spelling "StGit". Similarly replace "GIT" with its preferred spelling "Git". Signed-off-by: Peter Grayson --- .mailmap | 2 +- CHANGELOG.md | 2 +- contrib/stg-gitk | 6 +++--- contrib/stg-k | 2 +- examples/gitconfig | 6 +++--- setup.py | 4 ++-- stgit/commands/branch.py | 4 ++-- stgit/commands/commit.py | 2 +- stgit/commands/export.py | 2 +- stgit/commands/imprt.py | 2 +- stgit/commands/init.py | 4 ++-- stgit/commands/mail.py | 2 +- stgit/commands/sync.py | 2 +- stgit/commands/uncommit.py | 4 ++-- stgit/main.py | 2 +- t/README | 16 ++++++++-------- t/t0004-main.sh | 2 +- t/t0009-log.sh | 2 +- t/t1000-branch-create.sh | 2 +- t/t1002-branch-clone.sh | 8 ++++---- t/t1003-new.sh | 2 +- t/t1004-pack-ref.sh | 2 +- t/t1005-branch-delete.sh | 2 +- t/t1007-branch-protect.sh | 4 ++-- t/t1202-push-undo.sh | 2 +- t/t1203-push-conflict.sh | 2 +- t/t1208-push-and-pop.sh | 2 +- t/t1300-uncommit.sh | 2 +- t/t1301-repair.sh | 10 +++++----- t/t1303-commit.sh | 2 +- t/t1304-repair-hidden.sh | 2 +- t/t1500-float.sh | 2 +- t/t1600-delete-one.sh | 2 +- t/t1601-delete-many.sh | 2 +- t/t1602-delete-spill.sh | 2 +- t/t1800-import.sh | 2 +- t/t1800/patches/series | 2 +- t/t1801-import-email.sh | 2 +- t/t1900-mail.sh | 2 +- t/t2000-sync.sh | 2 +- t/t2704-refresh-spill.sh | 2 +- t/t3400-pick.sh | 2 +- t/t3600-fold.sh | 2 +- t/t4000-upgrade.sh | 2 +- 44 files changed, 67 insertions(+), 67 deletions(-) diff --git a/.mailmap b/.mailmap index 1a2b506..01a8569 100644 --- a/.mailmap +++ b/.mailmap @@ -1,5 +1,5 @@ # This list is used by various git commands to fix a few botched name -# translations in the StGIT repository. +# translations in the StGit repository. Bryan Larsen Bryan Larsen diff --git a/CHANGELOG.md b/CHANGELOG.md index 25f1c5a..292c7a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -232,7 +232,7 @@ - `stg mail` improvements for 'Suggested-by:' tag and auto generation of Cc for the cover letter based on all tags in the series - `stg mail` bash completion for the --to, --cc and --bcc options based - on the content of the [mail "alias"] section of GIT configuration + on the content of the [mail "alias"] section of Git configuration - `stg edit --review` option to add a 'Reviewed-by:' tag - `stg pop --spill` functionality to allow popping a patch from the stack while keeping its modification in the tree diff --git a/contrib/stg-gitk b/contrib/stg-gitk index f17c9c3..c26a131 100755 --- a/contrib/stg-gitk +++ b/contrib/stg-gitk @@ -1,7 +1,7 @@ #!/bin/sh set -e -# stg-gitk - helper script to graphically display an StGIT stack +# stg-gitk - helper script to graphically display an StGit stack # Displays given branches and stacks, without getting disturbed by # patch logs. @@ -59,10 +59,10 @@ else # expand patches for each named branch for b in $branches; do if [ -e "$GIT_DIR/refs/patches/$b" ]; then - # StGIT branch: show all patches + # StGit branch: show all patches refdirs="$refdirs $GIT_DIR/refs/heads/$b $GIT_DIR/refs/patches/$b" elif [ -e "$GIT_DIR/refs/heads/$b" ]; then - # other GIT branch + # other Git branch refdirs="$refdirs $GIT_DIR/refs/heads/$b" elif [ "$(git for-each-ref "refs/$b" | wc -l)" != 0 ]; then # other ref diff --git a/contrib/stg-k b/contrib/stg-k index 62211be..1affd43 100755 --- a/contrib/stg-k +++ b/contrib/stg-k @@ -1,7 +1,7 @@ #!/bin/sh set -e -# stg-k - execute given StGIT command while preserving local changes +# stg-k - execute given StGit command while preserving local changes # Uses a temporary patch to save local changes, then execute the given # command, and restore local changes from the saved patch. In diff --git a/examples/gitconfig b/examples/gitconfig index 4a05f0f..a39f2b9 100644 --- a/examples/gitconfig +++ b/examples/gitconfig @@ -1,9 +1,9 @@ -# StGIT configuration file. Copy it to any of ~/.gitconfig or +# StGit configuration file. Copy it to any of ~/.gitconfig or # .git/config and modify as needed. Note that the latter overrides # the former. The "git config" command can be used as well [user] - # Default author/committer details (standard GIT variables) + # Default author/committer details (standard Git variables) name = Your Name email = your.name@yourcompany.com @@ -41,7 +41,7 @@ #pager = less -FRSX #pager = filterdiff --annotate | colordiff | less -FRSX - # GIT pull and fetch commands (should take the same arguments as + # Git pull and fetch commands (should take the same arguments as # git fetch or git pull). By default: #pullcmd = git pull #fetchcmd = git fetch diff --git a/setup.py b/setup.py index 7ed43e9..c4d1c5e 100755 --- a/setup.py +++ b/setup.py @@ -41,13 +41,13 @@ def __check_python_version(): def __check_git_version(): - """Check the minimum GIT version""" + """Check the minimum Git version""" from stgit.run import Run gitver = Run('git', '--version').output_one_line().split()[2] if not __check_min_version(version.git_min_ver, gitver): print( - 'GIT version %s or newer required. Found %s' + 'Git version %s or newer required. Found %s' % (version.git_min_ver, gitver), file=sys.stderr, ) diff --git a/stgit/commands/branch.py b/stgit/commands/branch.py index 166923a..297df02 100644 --- a/stgit/commands/branch.py +++ b/stgit/commands/branch.py @@ -428,7 +428,7 @@ def func(parser, options, args): try: stack = repository.get_stack(branch_name) except StackException: - raise CmdException('Branch "%s" is not controlled by StGIT' % branch_name) + raise CmdException('Branch "%s" is not controlled by StGit' % branch_name) out.start('Protecting branch "%s"' % branch_name) stack.protected = True @@ -465,7 +465,7 @@ def func(parser, options, args): try: stack = repository.get_stack(branch_name) except StackException: - raise CmdException('Branch "%s" is not controlled by StGIT' % branch_name) + raise CmdException('Branch "%s" is not controlled by StGit' % branch_name) out.info('Unprotecting branch "%s"' % branch_name) stack.protected = False diff --git a/stgit/commands/commit.py b/stgit/commands/commit.py index b697e86..5ed995e 100644 --- a/stgit/commands/commit.py +++ b/stgit/commands/commit.py @@ -26,7 +26,7 @@ description = """ Merge one or more patches into the base of the current stack and remove them from the series while advancing the base. This is the opposite of 'stg uncommit'. Use this command if you no longer want to -manage a patch with StGIT. +manage a patch with StGit. By default, the bottommost patch is committed. If patch names are given, the stack is rearranged so that those patches are at the diff --git a/stgit/commands/export.py b/stgit/commands/export.py index ab5651e..ecfc7c8 100644 --- a/stgit/commands/export.py +++ b/stgit/commands/export.py @@ -142,7 +142,7 @@ def func(parser, options, args): series = io.open(os.path.join(dirname, 'series'), 'w') # note the base commit for this series base_commit = stack.base.sha1 - print('# This series applies on GIT commit %s' % base_commit, file=series) + print('# This series applies on Git commit %s' % base_commit, file=series) for patch_no, pn in enumerate(patches, 1): if options.patch: diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py index 8cd0bc0..2fefa55 100644 --- a/stgit/commands/imprt.py +++ b/stgit/commands/imprt.py @@ -50,7 +50,7 @@ generating the patch information. The command can also read series and mbox files. If a patch does not apply cleanly, the failed diff is written to the -.stgit-failed.patch file and an empty StGIT patch is added to the +.stgit-failed.patch file and an empty StGit patch is added to the stack. The patch description has to be separated from the data with a '---' diff --git a/stgit/commands/init.py b/stgit/commands/init.py index d98bff1..0d79fa0 100644 --- a/stgit/commands/init.py +++ b/stgit/commands/init.py @@ -17,11 +17,11 @@ You should have received a copy of the GNU General Public License along with this program; if not, see http://www.gnu.org/licenses/. """ -help = 'Initialise the current branch for use with StGIT' +help = 'Initialise the current branch for use with StGit' kind = 'stack' usage = [''] description = """ -Initialise the current git branch to be used as an StGIT stack. The +Initialise the current git branch to be used as an StGit stack. The branch (and the git repository it is in) must already exist and contain at least one commit.""" diff --git a/stgit/commands/mail.py b/stgit/commands/mail.py index f109674..5e05ac7 100644 --- a/stgit/commands/mail.py +++ b/stgit/commands/mail.py @@ -58,7 +58,7 @@ attachment using the --attach option in which case the The To/Cc/Bcc addresses can either be added to the template file or passed via the corresponding command line options. They can be e-mail addresses or aliases which are automatically expanded to the values -stored in the [mail "alias"] section of GIT configuration files. +stored in the [mail "alias"] section of Git configuration files. A preamble e-mail can be sent using the '--cover' and/or '--edit-cover' options. The first allows the user to specify a file to diff --git a/stgit/commands/sync.py b/stgit/commands/sync.py index cede2d6..0e6a5f7 100644 --- a/stgit/commands/sync.py +++ b/stgit/commands/sync.py @@ -77,7 +77,7 @@ def __branch_merge_patch(remote_stack, stack, commit, pname): def __series_merge_patch(patchdir, stack, commit, pname): - """Merge a patch file with the given StGIT patch.""" + """Merge a patch file with the given StGit patch.""" with io.open(os.path.join(patchdir, pname), 'rb') as f: diff = f.read() base = commit.data.parent diff --git a/stgit/commands/uncommit.py b/stgit/commands/uncommit.py index 451c1aa..6ddb7cb 100644 --- a/stgit/commands/uncommit.py +++ b/stgit/commands/uncommit.py @@ -28,7 +28,7 @@ usage = [ ] description = """ Take one or more git commits at the base of the current stack and turn -them into StGIT patches. The new patches are created as applied patches +them into StGit patches. The new patches are created as applied patches at the bottom of the stack. This is the opposite of 'stg commit'. By default, the number of patches to uncommit is determined by the @@ -38,7 +38,7 @@ for the first patch to uncommit, i.e. for the newest patch. The -n/--number option specifies the number of patches to uncommit. In this case, at most one patch name may be specified. It is used as prefix to which the patch number is appended. If no patch names are -provided on the command line, StGIT automatically generates them based +provided on the command line, StGit automatically generates them based on the first line of the patch description. The -t/--to option specifies that all commits up to and including the diff --git a/stgit/main.py b/stgit/main.py index 505088b..a2917f8 100644 --- a/stgit/main.py +++ b/stgit/main.py @@ -142,7 +142,7 @@ def _main(): if cmd in ['-v', '--version', 'version']: from stgit.version import get_version - print('Stacked GIT %s' % get_version()) + print('Stacked Git %s' % get_version()) os.system('git --version') print('Python version %s' % sys.version) sys.exit(utils.STGIT_SUCCESS) diff --git a/t/README b/t/README index 951ed4c..41ef0a5 100644 --- a/t/README +++ b/t/README @@ -1,11 +1,11 @@ The mechanism that powers this testsuite is directly imported from the -Core GIT Tests, in directory t/ of the git repository. Files are base +Core Git Tests, in directory t/ of the git repository. Files are base on git version 2.20.0. -Core GIT Tests +Core Git Tests ============== -This directory holds many test scripts for core GIT tools. The +This directory holds many test scripts for core Git tools. The first part of this short document describes how to run the tests and read their output. @@ -870,21 +870,21 @@ Tips for Writing Tests As with any programming projects, existing programs are the best source of the information. However, do _not_ emulate t0000-basic.sh when writing your tests. The test is special in -that it tries to validate the very core of GIT. For example, it +that it tries to validate the very core of Git. For example, it knows that there will be 256 subdirectories under .git/objects/, and it knows that the object ID of an empty tree is a certain 40-byte string. This is deliberately done so in t0000-basic.sh because the things the very basic core test tries to achieve is -to serve as a basis for people who are changing the GIT internal +to serve as a basis for people who are changing the Git internal drastically. For these people, after making certain changes, not seeing failures from the basic test _is_ a failure. And -such drastic changes to the core GIT that even changes these +such drastic changes to the core Git that even changes these otherwise supposedly stable object IDs should be accompanied by an update to t0000-basic.sh. However, other tests that simply rely on basic parts of the core -GIT working properly should not have that level of intimate -knowledge of the core GIT internals. If all the test scripts +Git working properly should not have that level of intimate +knowledge of the core Git internals. If all the test scripts hardcoded the object IDs like t0000-basic.sh does, that defeats the purpose of t0000-basic.sh, which is to isolate that level of validation in one place. Your test also ends up needing diff --git a/t/t0004-main.sh b/t/t0004-main.sh index 33ca1f1..504b692 100755 --- a/t/t0004-main.sh +++ b/t/t0004-main.sh @@ -49,7 +49,7 @@ test_expect_success 'Test version/--version equivalence' ' stg version > v0.txt && stg --version > v1.txt && diff v0.txt v1.txt && - grep -e "Stacked GIT" v0.txt && + grep -e "Stacked Git" v0.txt && grep -F "$(git --version)" v0.txt && grep -e "Python version" v0.txt ' diff --git a/t/t0009-log.sh b/t/t0009-log.sh index fbbe431..8a2e589 100755 --- a/t/t0009-log.sh +++ b/t/t0009-log.sh @@ -8,7 +8,7 @@ test_expect_success 'Attempt log on uninitialized branch' ' command_error stg log 2>&1 >/dev/null | grep -e "branch not initialized" ' -test_expect_success 'Initialize the StGIT repository' ' +test_expect_success 'Initialize the StGit repository' ' stg init ' diff --git a/t/t1000-branch-create.sh b/t/t1000-branch-create.sh index 3799619..b4d4e5c 100755 --- a/t/t1000-branch-create.sh +++ b/t/t1000-branch-create.sh @@ -24,7 +24,7 @@ test_expect_success \ ' test_expect_success \ - 'Create a branch when the current one is not an StGIT stack' ' + 'Create a branch when the current one is not an StGit stack' ' git branch regular-branch && git branch --set-upstream-to=origin/master regular-branch && stg branch --create new regular-branch && diff --git a/t/t1002-branch-clone.sh b/t/t1002-branch-clone.sh index 104ca15..52eedf9 100755 --- a/t/t1002-branch-clone.sh +++ b/t/t1002-branch-clone.sh @@ -11,7 +11,7 @@ Exercises branch cloning options. . ./test-lib.sh test_expect_success \ - 'Create a GIT commit' \ + 'Create a Git commit' \ ' echo bar > bar.txt && stg add bar.txt && @@ -19,13 +19,13 @@ test_expect_success \ ' test_expect_success \ - 'Try to create a patch in a GIT branch' \ + 'Try to create a patch in a Git branch' \ ' command_error stg new p0 -m "p0" ' test_expect_success \ - 'Clone the current GIT branch' \ + 'Clone the current Git branch' \ ' stg branch --clone foo && stg new p1 -m "p1" && @@ -33,7 +33,7 @@ test_expect_success \ ' test_expect_success \ - 'Clone the current StGIT branch' \ + 'Clone the current StGit branch' \ ' stg branch --clone bar && test "$(stg series --applied -c)" -eq 1 && diff --git a/t/t1003-new.sh b/t/t1003-new.sh index 836dbee..ea2a5f0 100755 --- a/t/t1003-new.sh +++ b/t/t1003-new.sh @@ -8,7 +8,7 @@ test_description='Test "stg new".' . ./test-lib.sh test_expect_success \ - 'Initialize the StGIT repository' ' + 'Initialize the StGit repository' ' stg init ' diff --git a/t/t1004-pack-ref.sh b/t/t1004-pack-ref.sh index 5339a5d..5110af3 100755 --- a/t/t1004-pack-ref.sh +++ b/t/t1004-pack-ref.sh @@ -3,7 +3,7 @@ # Copyright (c) 2007 Karl Hasselström # -test_description='Test that StGIT can handle packed refs' +test_description='Test that StGit can handle packed refs' . ./test-lib.sh stg init diff --git a/t/t1005-branch-delete.sh b/t/t1005-branch-delete.sh index 369ceea..cb21848 100755 --- a/t/t1005-branch-delete.sh +++ b/t/t1005-branch-delete.sh @@ -48,7 +48,7 @@ test_expect_success 'Invalid num args to delete' ' grep -e "incorrect number of arguments" ' -test_expect_success 'Create a non-StGIT branch and delete it' ' +test_expect_success 'Create a non-StGit branch and delete it' ' git branch bar && stg branch --delete bar ' diff --git a/t/t1007-branch-protect.sh b/t/t1007-branch-protect.sh index ac87909..a581f53 100755 --- a/t/t1007-branch-protect.sh +++ b/t/t1007-branch-protect.sh @@ -70,12 +70,12 @@ test_expect_success 'Cleanup unprotected' ' test_expect_success 'Protect uninitialized branch' ' command_error stg branch --protect 2>&1 | - grep -E "is not controlled by StGIT" + grep -E "is not controlled by StGit" ' test_expect_success 'Protect uninitialized branch' ' command_error stg branch --unprotect 2>&1 | - grep -E "is not controlled by StGIT" + grep -E "is not controlled by StGit" ' test_expect_success 'Delete unprotected' ' diff --git a/t/t1202-push-undo.sh b/t/t1202-push-undo.sh index 5afcf68..c75540e 100755 --- a/t/t1202-push-undo.sh +++ b/t/t1202-push-undo.sh @@ -12,7 +12,7 @@ missing file. The "stg undo" command has to be able to revert it. . ./test-lib.sh test_expect_success \ - 'Initialize the StGIT repository' \ + 'Initialize the StGit repository' \ 'stg init ' diff --git a/t/t1203-push-conflict.sh b/t/t1203-push-conflict.sh index b759298..cf8adb4 100755 --- a/t/t1203-push-conflict.sh +++ b/t/t1203-push-conflict.sh @@ -11,7 +11,7 @@ Test that the index has no modifications after a push with conflicts. . ./test-lib.sh test_expect_success \ - 'Initialize the StGIT repository' \ + 'Initialize the StGit repository' \ 'stg init ' diff --git a/t/t1208-push-and-pop.sh b/t/t1208-push-and-pop.sh index 43c83a1..e2330d5 100755 --- a/t/t1208-push-and-pop.sh +++ b/t/t1208-push-and-pop.sh @@ -12,7 +12,7 @@ test_expect_success \ command_error stg push 2>&1 | grep -e "branch not initialized" ' test_expect_success \ - 'Initialize the StGIT repository' \ + 'Initialize the StGit repository' \ 'stg init' test_expect_success \ diff --git a/t/t1300-uncommit.sh b/t/t1300-uncommit.sh index c391abc..5915821 100755 --- a/t/t1300-uncommit.sh +++ b/t/t1300-uncommit.sh @@ -10,7 +10,7 @@ test_description='Test the uncommit command. . ./test-lib.sh test_expect_success \ - 'Initialize the StGIT repository' \ + 'Initialize the StGit repository' \ 'stg init ' diff --git a/t/t1301-repair.sh b/t/t1301-repair.sh index 8bcf9cb..60dd23f 100755 --- a/t/t1301-repair.sh +++ b/t/t1301-repair.sh @@ -7,7 +7,7 @@ test_expect_success 'Repair in a non-initialized repository' ' command_error stg repair ' -test_expect_success 'Initialize the StGIT repository' ' +test_expect_success 'Initialize the StGit repository' ' stg init ' @@ -38,20 +38,20 @@ test_expect_success 'Repair when there is nothing to do' ' stg repair ' -test_expect_success 'Create a GIT commit' ' +test_expect_success 'Create a Git commit' ' echo bar > bar.txt && git add bar.txt && git commit -a -m bar ' -test_expect_success 'Turn one GIT commit into a patch' ' +test_expect_success 'Turn one Git commit into a patch' ' [ "$(echo $(stg series --applied --noprefix))" = "foo" ] stg repair && [ "$(echo $(stg series --applied --noprefix))" = "foo bar" ] [ $(stg series --unapplied -c) -eq 0 ] ' -test_expect_success 'Create three more GIT commits' ' +test_expect_success 'Create three more Git commits' ' echo one > numbers.txt && git add numbers.txt && git commit -a -m one && @@ -61,7 +61,7 @@ test_expect_success 'Create three more GIT commits' ' git commit -a -m three ' -test_expect_success 'Turn three GIT commits into patches' ' +test_expect_success 'Turn three Git commits into patches' ' [ "$(echo $(stg series --applied --noprefix))" = "foo bar" ] stg repair && [ "$(echo $(stg series --applied --noprefix))" = "foo bar one two three" ] diff --git a/t/t1303-commit.sh b/t/t1303-commit.sh index 6d7f4b2..cc3574f 100755 --- a/t/t1303-commit.sh +++ b/t/t1303-commit.sh @@ -2,7 +2,7 @@ test_description='Test stg commit' . ./test-lib.sh -test_expect_success 'Initialize the StGIT repository' ' +test_expect_success 'Initialize the StGit repository' ' stg init ' diff --git a/t/t1304-repair-hidden.sh b/t/t1304-repair-hidden.sh index 5988366..cd91060 100755 --- a/t/t1304-repair-hidden.sh +++ b/t/t1304-repair-hidden.sh @@ -4,7 +4,7 @@ test_description='Test repair with hidden patches' . ./test-lib.sh -test_expect_success 'Initialize the StGIT repository' ' +test_expect_success 'Initialize the StGit repository' ' stg init && stg new A -m "a" && echo A >a.txt && stg add a.txt && stg refresh && stg new B -m "b" && echo B >b.txt && stg add b.txt && stg refresh && diff --git a/t/t1500-float.sh b/t/t1500-float.sh index a45652e..741d563 100755 --- a/t/t1500-float.sh +++ b/t/t1500-float.sh @@ -10,7 +10,7 @@ test_description='Test floating a number of patches to the top of the stack . ./test-lib.sh test_expect_success \ - 'Initialize the StGIT repository' \ + 'Initialize the StGit repository' \ 'stg init && stg new A -m "a" && echo A >a.txt && stg add a.txt && stg refresh && stg new B -m "b" && echo B >b.txt && stg add b.txt && stg refresh && diff --git a/t/t1600-delete-one.sh b/t/t1600-delete-one.sh index cb72058..232c92d 100755 --- a/t/t1600-delete-one.sh +++ b/t/t1600-delete-one.sh @@ -4,7 +4,7 @@ test_description='Test the delete command (deleting one patch at a time).' . ./test-lib.sh test_expect_success \ - 'Initialize the StGIT repository' \ + 'Initialize the StGit repository' \ 'stg init' test_expect_success \ diff --git a/t/t1601-delete-many.sh b/t/t1601-delete-many.sh index 43dadf1..87de87b 100755 --- a/t/t1601-delete-many.sh +++ b/t/t1601-delete-many.sh @@ -4,7 +4,7 @@ test_description='Test the delete command (deleting many patches at once).' . ./test-lib.sh test_expect_success \ - 'Initialize the StGIT repository' \ + 'Initialize the StGit repository' \ 'stg init' test_expect_success \ diff --git a/t/t1602-delete-spill.sh b/t/t1602-delete-spill.sh index 3e27598..859f58a 100755 --- a/t/t1602-delete-spill.sh +++ b/t/t1602-delete-spill.sh @@ -2,7 +2,7 @@ test_description='Test "stg delete --spill"' . ./test-lib.sh -test_expect_success 'Initialize the StGIT repository' ' +test_expect_success 'Initialize the StGit repository' ' stg init ' diff --git a/t/t1800-import.sh b/t/t1800-import.sh index e739b2a..493052c 100755 --- a/t/t1800-import.sh +++ b/t/t1800-import.sh @@ -4,7 +4,7 @@ test_description='Test the import command' . ./test-lib.sh test_expect_success \ - 'Initialize the StGIT repository' \ + 'Initialize the StGit repository' \ ' cp "$TEST_DIRECTORY"/t1800/foo.txt . && stg add foo.txt && diff --git a/t/t1800/patches/series b/t/t1800/patches/series index 5945c98..a5cf740 100644 --- a/t/t1800/patches/series +++ b/t/t1800/patches/series @@ -1,4 +1,4 @@ -# This series applies on GIT commit 6a8b6f6e2ecbcab26de7656b66b7f30eeba1ee96 +# This series applies on Git commit 6a8b6f6e2ecbcab26de7656b66b7f30eeba1ee96 first-stanza.patch second-stanza.patch third-stanza.patch diff --git a/t/t1801-import-email.sh b/t/t1801-import-email.sh index 233bcc1..f71807d 100755 --- a/t/t1801-import-email.sh +++ b/t/t1801-import-email.sh @@ -5,7 +5,7 @@ test_description='Test import from emails' . ./test-lib.sh test_expect_success \ - 'Initialize the StGIT repository' \ + 'Initialize the StGit repository' \ ' cp "$TEST_DIRECTORY"/t1800/foo.txt . && stg add foo.txt && diff --git a/t/t1900-mail.sh b/t/t1900-mail.sh index de6c65d..a00c1fc 100755 --- a/t/t1900-mail.sh +++ b/t/t1900-mail.sh @@ -3,7 +3,7 @@ test_description='Test the mail command' . ./test-lib.sh -test_expect_success 'Initialize the StGIT repository' ' +test_expect_success 'Initialize the StGit repository' ' git config stgit.sender "A U Thor " && test_commit_bulk --message="Patch %s" --filename=foo.txt --contents="line %s" 5 && stg init && diff --git a/t/t2000-sync.sh b/t/t2000-sync.sh index f93d87e..8fb532a 100755 --- a/t/t2000-sync.sh +++ b/t/t2000-sync.sh @@ -8,7 +8,7 @@ test_description='Test the sync command.' . ./test-lib.sh test_expect_success \ - 'Initialize the StGIT repository' \ + 'Initialize the StGit repository' \ ' stg init ' diff --git a/t/t2704-refresh-spill.sh b/t/t2704-refresh-spill.sh index 563374e..b4b4bc3 100755 --- a/t/t2704-refresh-spill.sh +++ b/t/t2704-refresh-spill.sh @@ -5,7 +5,7 @@ test_description='Test "stg pop --spill"' . ./test-lib.sh -test_expect_success 'Initialize the StGIT repository and create a patch and add some files' ' +test_expect_success 'Initialize the StGit repository and create a patch and add some files' ' stg init && echo expected*.txt >> .git/info/exclude && echo patches.txt >> .git/info/exclude && diff --git a/t/t3400-pick.sh b/t/t3400-pick.sh index f5f56e1..87e77e7 100755 --- a/t/t3400-pick.sh +++ b/t/t3400-pick.sh @@ -11,7 +11,7 @@ test_expect_success \ ' test_expect_success \ - 'Initialize the StGIT repository' \ + 'Initialize the StGit repository' \ ' stg init && stg new A -m "a" && echo A > a && stg add a && stg refresh && diff --git a/t/t3600-fold.sh b/t/t3600-fold.sh index 0e00e55..cebb2ba 100755 --- a/t/t3600-fold.sh +++ b/t/t3600-fold.sh @@ -4,7 +4,7 @@ test_description='Test the fold command.' . ./test-lib.sh -test_expect_success 'Initialize StGIT repository' ' +test_expect_success 'Initialize StGit repository' ' stg init && echo hello > foo.txt && git add foo.txt && diff --git a/t/t4000-upgrade.sh b/t/t4000-upgrade.sh index 20a75a7..60b589a 100755 --- a/t/t4000-upgrade.sh +++ b/t/t4000-upgrade.sh @@ -3,7 +3,7 @@ # Copyright (c) 2007 Karl Hasselström # -test_description='Make sure that we can use old StGIT repositories' +test_description='Make sure that we can use old StGit repositories' . ./test-lib.sh -- 2.11.4.GIT