Merge branch 'stable'

Conflicts:
	stgit/commands/diff.py
	stgit/commands/edit.py
	stgit/commands/export.py
	stgit/commands/files.py
	stgit/commands/mail.py
	stgit/gitmergeonefile.py
	t/t1200-push-modified.sh
	t/t1201-pull-trailing.sh
	t/test-lib.sh

diff --git a/.mailmap b/.mailmap
index ecaafff8f69b0fdb8965d6b8b4883acc3ed0985d..cdb1bebbe1deaaaf935b7b5c77f05dc8803f009f 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,4 @@
-# This list is used by git-shortlog to fix a few botched name
+# This list is used by various git commands to fix a few botched name
 # translations in the StGIT repository.
 
 Bryan Larsen <bryan.larsen@gmail.com>

diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index 6eaa623bf69fb475a0fa9256c68e822fd4b314e6..5d2e50ab816e6589d189fcdff4e8620f3e3bac81 100644 (file)
--- a/Documentation/tutorial.txt
+++ b/Documentation/tutorial.txt
@@ -32,7 +32,7 @@ Repository initialisation
 -------------------------
 
 In stand-alone mode, StGIT is used in conjunction with a GIT repository
-that is already initialised (using 'git-init-db'). StGIT cannot be used
+that is already initialised (using 'git init'). StGIT cannot be used
 outside of a GIT repository.
 Any branch in a GIT repository may be managed by StGIT. Each branch
 managed by StGIT contains an independent series of StGIT patches.

diff --git a/contrib/release/post-update b/contrib/release/post-update
index d7ae4ca0a066b6e93ffb4254d24f83bd312fc1d2..6cbad716c39e6c0c44acfa2ccc8f3ea3dde1bb0e 100755 (executable)
--- a/contrib/release/post-update
+++ b/contrib/release/post-update
@@ -6,7 +6,7 @@
 # To enable this hook, make this file executable by "chmod +x post-update".
 
 git repack -d
-git-update-server-info
+git update-server-info
 
 # FTP upload
 lftp ftp://your-ftp-site/stgit.git -u username,password -e " \

diff --git a/contrib/release/release.sh b/contrib/release/release.sh
index 7c2d0b9c7d14dd043f4fdaa0707d23cdaeaba28c..7fada5d5c4b2c6ebb7bf5b59b41261c9b2b6799e 100755 (executable)
--- a/contrib/release/release.sh
+++ b/contrib/release/release.sh
@@ -13,7 +13,7 @@ BINRPM=dist/stgit-$VERSION-1.noarch.rpm
 SRCRPM=dist/stgit-$VERSION-1.src.rpm
 DEBPKG=../stgit_$VERSION-0_all.deb
 
-git-rev-list --pretty HEAD > ChangeLog
+git rev-list --pretty HEAD > ChangeLog
 
 rm -f MANIFEST
 

diff --git a/contrib/release/snapshot.sh b/contrib/release/snapshot.sh
index a81df52211476a8535e6f8ba9f2bb5cbf2a2017e..71b447f4a8540e8eb9e27df61540d12412c79614 100755 (executable)
--- a/contrib/release/snapshot.sh
+++ b/contrib/release/snapshot.sh
@@ -5,7 +5,7 @@
 VERSION=`date "+%Y%m%d"`
 SNAPSHOT=dist/stgit-$VERSION.tar.gz
 
-git-rev-list --pretty HEAD > ChangeLog
+git rev-list --pretty HEAD > ChangeLog
 
 mv stgit/version.py stgit/version.py-
 echo "version = '$VERSION'" > stgit/version.py

diff --git a/contrib/stg-cvs b/contrib/stg-cvs
index 582f4f2d302ca7938034d18b069f649d3e64c3ae..393c982994e1bf9942895befa77188b226d1e123 100755 (executable)
--- a/contrib/stg-cvs
+++ b/contrib/stg-cvs
@@ -39,11 +39,11 @@ set -e
 #   VCS
 # - lacks synchronisation of .cvsignore <-> .gitignore
 # - no support for filenames with spaces (stg lacks --zero output format)
-# - git-commit is too chatty when it finds nothing to commit
+# - git commit is too chatty when it finds nothing to commit
 # - lacks a "quick cvs commit" feature
 
 # DESIGN FLAWS
-# - while fetching, if a file change was not git-update-index'd when
+# - while fetching, if a file change was not git update-index'd when
 #   cvs-update'd (eg. because of a stg-cvs bug), it is not seen on further
 #   fetches until it changes again, since we scan "cvs update" output.
 #   This yields possible inconsistencies with CVS.
@@ -116,7 +116,7 @@ cvs_add_dir()
 
 # get context
 branch=$(stg branch)
-parent=$(git-config "branch.${branch}.stgit.parentbranch") || 
+parent=$(git config "branch.${branch}.stgit.parentbranch") || 
     usage "no declared parent for '$branch' - set branch.${branch}.stgit.parentbranch"
 
 # extract command
@@ -165,7 +165,7 @@ commit)
 
     # sync the parent branch
     stg branch "$parent"
-    git-cherry-pick "patches/${branch}/${patch}"
+    git cherry-pick "patches/${branch}/${patch}"
     stg branch "${branch}"
 
     # update

diff --git a/contrib/stg-gitk b/contrib/stg-gitk
index cb264e523cf38ac51e01083b84e2e44282c35363..e3ddfb17933a3a6475c5a636954516ba031f2dc6 100755 (executable)
--- a/contrib/stg-gitk
+++ b/contrib/stg-gitk
@@ -40,7 +40,7 @@ if [ $allbranches = 1 ] && [ "$branches" != "" ]; then
     usage
 fi
 
-GIT_DIR=$(git-rev-parse --git-dir)
+GIT_DIR=$(git rev-parse --git-dir)
 GIT_DIR_SPKIPLEN=$(printf "$GIT_DIR/X" | wc -c)
 
 refdirs=''
@@ -64,9 +64,9 @@ else
        elif [ -e "$GIT_DIR/refs/heads/$b" ]; then
            # other GIT branch
            refdirs="$refdirs $GIT_DIR/refs/heads/$b"
-       elif [ $(git-for-each-ref "refs/$b" | wc -l) != 0 ]; then
+       elif [ $(git for-each-ref "refs/$b" | wc -l) != 0 ]; then
            # other ref
-           refdirs="$refdirs $(git-for-each-ref --format="$GIT_DIR/%(refname)" "refs/$b")"
+           refdirs="$refdirs $(git for-each-ref --format="$GIT_DIR/%(refname)" "refs/$b")"
        else
            echo >&2 "ERROR: no such ref '$b'"
            usage

diff --git a/contrib/stg-whatchanged b/contrib/stg-whatchanged
index afeda2c99cff51580a495da47ac6732f309a9dbf..f1f53081d80e2ef4c5e394468ff2d0aea4b18a96 100755 (executable)
--- a/contrib/stg-whatchanged
+++ b/contrib/stg-whatchanged
@@ -23,7 +23,7 @@ fi
 
 # Merges via "push" leave top=bottom so we must look at old patch
 # in this case (unlike, eg., "pick --fold")
-patchdir="$(git-rev-parse --git-dir)/patches/$(stg branch)/patches/$(stg top)"
+patchdir="$(git rev-parse --git-dir)/patches/$(stg branch)/patches/$(stg top)"
 case $(stg log | head -n1) in
     *push\(c\)*) former="//top.old" ;;
     *) former="//top" ;;

diff --git a/contrib/stgbashprompt.sh b/contrib/stgbashprompt.sh
index 5927e679e5c676376f580331552632a72e4b2a0b..d5c4994211fc354a529559943832af19fb54450e 100755 (executable)
--- a/contrib/stgbashprompt.sh
+++ b/contrib/stgbashprompt.sh
@@ -5,8 +5,8 @@ if [ "$PS1" ]; then
        function __prompt_git()
        {
                local git_dir ref br top;
-               git_dir=$(git-rev-parse --git-dir 2> /dev/null) || return
-               ref=$(git-symbolic-ref HEAD 2> /dev/null) || return
+               git_dir=$(git rev-parse --git-dir 2> /dev/null) || return
+               ref=$(git symbolic-ref HEAD 2> /dev/null) || return
                br=${ref#refs/heads/}
                top=$(tail -n 1 $git_dir/patches/$br/applied 2>/dev/null) \
                top=${top:-(none)}

diff --git a/examples/gitconfig b/examples/gitconfig
index 28d94af48d5677d5cdb05d559d6d8f7f909c30bf..4a362021860bac1293f240a4832cb844a7ed92cb 100644 (file)
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -43,14 +43,14 @@
        #pager = filterdiff --annotate | colordiff | less -FRX
 
        # GIT pull and fetch commands (should take the same arguments as
-       # git-fetch or git-pull).  By default:
-       #pullcmd = git-pull
-       #fetchcmd = git-fetch
+       # git fetch or git pull).  By default:
+       #pullcmd = git pull
+       #fetchcmd = git fetch
 
        # Rebase command. Note that this command is internally implemented in
        # a different way. Only define this option if a different rebase
        # is needed (i.e. 'git svn rebase')
-       #rebasecmd = git-reset
+       #rebasecmd = git reset
 
        # "stg pull" policy.  This is the repository default, which can be
        # overriden on a per-branch basis using branch.*.stgit.pull-policy

diff --git a/stgit/commands/pick.py b/stgit/commands/pick.py
index 2a670e8523371fce6ccb17165fab1eef728cd6a0..44b461e7f4a9ecbac9e859b2ed33fe91831eae02 100644 (file)
--- a/stgit/commands/pick.py
+++ b/stgit/commands/pick.py
@@ -81,7 +81,7 @@ def __pick_commit(commit_id, patchname, options):
     if options.fold:
         out.start('Folding commit %s' % commit_id)
 
-        # try a direct git-apply first
+        # try a direct git apply first
         if not git.apply_diff(bottom, top):
             git.merge_recursive(bottom, git.get_head(), top)
 

diff --git a/t/README b/t/README
index 757f8101669f6e17fa287f42124981734d76123c..1e9510b76744ccdccb3d5ac8c0a337693e0ba454 100644 (file)
--- a/t/README
+++ b/t/README
@@ -22,11 +22,11 @@ The easiest way to run tests is to say "make -C t".  This runs all
 the tests.
 
     *** t0000-basic.sh ***
-    *   ok 1: .git/objects should be empty after git-init-db in an empty repo.
+    *   ok 1: .git/objects should be empty after git init in an empty repo.
     *   ok 2: .git/objects should have 256 subdirectories.
-    *   ok 3: git-update-index without --add should fail adding.
+    *   ok 3: git update-index without --add should fail adding.
     ...
-    *   ok 23: no diff after checkout and git-update-index --refresh.
+    *   ok 23: no diff after checkout and git update-index --refresh.
     * passed all 23 test(s)
     *** t0100-environment-names.sh ***
     *   ok 1: using old names should issue warnings.
@@ -37,9 +37,9 @@ Or you can run each test individually from command line, like
 this:
 
     $ sh ./t3001-ls-files-killed.sh
-    *   ok 1: git-update-index --add to add various paths.
-    *   ok 2: git-ls-files -k to show killed files.
-    *   ok 3: validate git-ls-files -k output.
+    *   ok 1: git update-index --add to add various paths.
+    *   ok 2: git ls-files -k to show killed files.
+    *   ok 3: validate git ls-files -k output.
     * passed all 3 test(s)
 
 You can pass --verbose (or -v), --debug (or -d), and --immediate
@@ -105,7 +105,7 @@ assignment to variable 'test_description', like this:
        test_description='xxx test (option --frotz)
 
        This test registers the following structure in the cache
-       and tries to run git-ls-files with option --frotz.'
+       and tries to run git ls-files with option --frotz.'
 
 
 Source 'test-lib.sh'
@@ -154,8 +154,8 @@ library for your script to use.
    Example:
 
        test_expect_success \
-           'git-write-tree should be able to write an empty tree.' \
-           'tree=$(git-write-tree)'
+           'git write-tree should be able to write an empty tree.' \
+           'tree=$(git write-tree)'
 
  - test_expect_failure <message> <script>
 

diff --git a/t/t1200-push-modified.sh b/t/t1200-push-modified.sh
index 113e41d5e1c57c39a931bc36604d77539d3bba2f..35c9bdda24b09eeadfdcfce199eac97870f6a540 100755 (executable)
--- a/t/t1200-push-modified.sh
+++ b/t/t1200-push-modified.sh
@@ -35,8 +35,8 @@ test_expect_success \
     'Port those patches to orig tree' '
     (
         cd foo &&
-        GIT_DIR=../bar/.git git-format-patch --stdout \
-          $(cd ../bar && stg id master:{base})..HEAD | git-am -3 -k
+        GIT_DIR=../bar/.git git format-patch --stdout \
+          $(cd ../bar && stg id master:{base})..HEAD | git am -3 -k
     )
 '
 

diff --git a/t/t1201-pull-trailing.sh b/t/t1201-pull-trailing.sh
index 8a748737b4cab3b66ef3dffec18035645a8dd45d..3a7efc1f434e40fb703a30963602c375363e876d 100755 (executable)
--- a/t/t1201-pull-trailing.sh
+++ b/t/t1201-pull-trailing.sh
@@ -29,9 +29,9 @@ test_expect_success \
 test_expect_success \
     'Port those patches to orig tree' \
     '(cd foo &&
-      GIT_DIR=../bar/.git git-format-patch --stdout \
+      GIT_DIR=../bar/.git git format-patch --stdout \
           $(cd ../bar && stg id master:{base})..HEAD |
-      git-am -3 -k
+      git am -3 -k
      )
     '
 

diff --git a/t/t1302-repair-interop.sh b/t/t1302-repair-interop.sh
index 224c4bad5b7e4a70b036c82df5e8def1a609bece..9fad3fa892b72b8b32548df00917cee46d82939f 100755 (executable)
--- a/t/t1302-repair-interop.sh
+++ b/t/t1302-repair-interop.sh
@@ -25,7 +25,7 @@ test_expect_success 'Create five patches' '
     [ "$(echo $(stg series --unapplied --noprefix))" = "" ]
 '
 
-test_expect_success 'Pop two patches with git-reset' '
+test_expect_success 'Pop two patches with git reset' '
     git reset --hard HEAD~2 &&
     command_error stg refresh &&
     stg repair &&
@@ -40,7 +40,7 @@ test_expect_success 'Create a new patch' '
     [ "$(echo $(stg series --unapplied --noprefix))" = "p3 p4" ]
 '
 
-test_expect_success 'Go to an unapplied patch with with git-reset' '
+test_expect_success 'Go to an unapplied patch with with git reset' '
     git reset --hard $(stg id p3) &&
     command_error stg refresh &&
     stg repair &&
@@ -49,7 +49,7 @@ test_expect_success 'Go to an unapplied patch with with git-reset' '
     [ "$(echo $(stg series --unapplied --noprefix))" = "q0 p4" ]
 '
 
-test_expect_success 'Go back to below the stack base with git-reset' '
+test_expect_success 'Go back to below the stack base with git reset' '
     git reset --hard foo-tag &&
     stg repair &&
     [ "$(echo $(stg series --applied --noprefix))" = "" ] &&

diff --git a/t/t2702-refresh-rm.sh b/t/t2702-refresh-rm.sh
index 896ebf39e2bcc7a10f3a4494ef5fd1a81db262a7..0362cc60211c775723b51d3dfcb6734e37552016 100755 (executable)
--- a/t/t2702-refresh-rm.sh
+++ b/t/t2702-refresh-rm.sh
@@ -28,7 +28,7 @@ cat > expected0.txt <<EOF
 D y.txt
 EOF
 printf '' > expected1.txt
-test_expect_success 'git-rm a file' '
+test_expect_success 'git rm a file' '
     stg new -m p0 &&
     git rm y.txt &&
     stg status > status0.txt &&
@@ -47,7 +47,7 @@ D y.txt
 M x.txt
 EOF
 printf '' > expected1.txt
-test_expect_success 'git-rm a file together with other changes' '
+test_expect_success 'git rm a file together with other changes' '
     stg new -m p1 &&
     echo x2 >> x.txt &&
     git rm y.txt &&