-# 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>
-------------------------
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.
# 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 " \
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
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
# 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.
# 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
# sync the parent branch
stg branch "$parent"
- git-cherry-pick "patches/${branch}/${patch}"
+ git cherry-pick "patches/${branch}/${patch}"
stg branch "${branch}"
# update
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=''
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
# 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" ;;
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)}
#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
metavar = 'rev1[..[rev2]]', dest = 'revs',
help = 'show the diff between revisions'),
make_option('-O', '--diff-opts',
- help = 'options to pass to git-diff'),
+ help = 'options to pass to git diff'),
make_option('-s', '--stat',
help = 'show the stat instead of the diff',
action = 'store_true')]
make_option('-f', '--file',
help = 'use FILE instead of invoking the editor'),
make_option('-O', '--diff-opts',
- help = 'options to pass to git-diff'),
+ help = 'options to pass to git diff'),
make_option('--undo',
help = 'revert the commit generated by the last edit',
action = 'store_true'),
make_option('-b', '--branch',
help = 'use BRANCH instead of the default one'),
make_option('-O', '--diff-opts',
- help = 'options to pass to git-diff'),
+ help = 'options to pass to git diff'),
make_option('-s', '--stdout',
help = 'dump the patches to the standard output',
action = 'store_true')]
make_option('-b', '--branch',
help = 'use BRANCH instead of the default one'),
make_option('-O', '--diff-opts',
- help = 'options to pass to git-diff'),
+ help = 'options to pass to git diff'),
make_option('--bare',
help = 'bare file names (useful for scripting)',
action = 'store_true')]
make_option('-b', '--branch',
help = 'use BRANCH instead of the default one'),
make_option('-O', '--diff-opts',
- help = 'options to pass to git-diff'),
+ help = 'options to pass to git diff'),
make_option('-m', '--mbox',
help = 'generate an mbox file instead of sending',
action = 'store_true')]
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(bottom, git.get_head(), top, recursive = True)
if orig_hash:
# modified in both
if file1_hash and file2_hash:
- # if modes are the same (git-read-tree probably dealt with it)
+ # if modes are the same (git read-tree probably dealt with it)
if file1_hash == file2_hash:
if os.system('git update-index --cacheinfo %s %s %s'
% (file1_mode, file1_hash, path)) != 0:
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.
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
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'
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>
'Port those patches to orig tree' '
(
cd foo &&
- GIT_DIR=../bar/.git git-format-patch --stdout \
- $(cd ../bar && stg id base@master)..HEAD | git-am -3 -k
+ GIT_DIR=../bar/.git git format-patch --stdout \
+ $(cd ../bar && stg id base@master)..HEAD | git am -3 -k
)
'
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 base@master)..HEAD |
- git-am -3 -k
+ git am -3 -k
)
'
[ "$(echo $(stg unapplied))" = "" ]
'
-test_expect_success 'Pop two patches with git-reset' '
+test_expect_success 'Pop two patches with git reset' '
git reset --hard HEAD~2 &&
! stg refresh &&
stg repair &&
[ "$(echo $(stg unapplied))" = "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) &&
! stg refresh &&
stg repair &&
[ "$(echo $(stg unapplied))" = "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 applied))" = "" ] &&
repo="$1"
mkdir "$repo"
cd "$repo" || error "Cannot setup test environment"
- git-init >/dev/null 2>&1 ||
- error "cannot run git-init -- have you installed git-core?"
+ git init >/dev/null 2>&1 ||
+ error "cannot run git init -- have you installed git-core?"
mkdir .git/info
echo "empty start" |
- git-commit-tree `git-write-tree` >.git/refs/heads/master 2>&4 ||
- error "cannot run git-commit -- is your git-core functioning?"
+ git commit-tree `git write-tree` >.git/refs/heads/master 2>&4 ||
+ error "cannot run git commit -- is your git-core functioning?"
cd "$owd"
}
~mdw / stgit / commitdiff