This is the mail archive of the cygwin mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [ANNOUNCEMENT] New package: stgit 0.13-1 -- Quilt functionality on top of git


Jari Aalto schrieb:
PACKAGE DESCRIPTION
===================

Homepage: http://procode.org/stgit
License : GPL

Offer similar functionality to quilt i.e. pushing/popping patches
to/from a stack) on top of git. These operations are performed using
git commands and the patches are stored as git commit objects,
allowing easy merging of the stgit patches into other repositories
using standard git functionality.

CHANGES SINCE LAST RELEASE
==========================

Not applicaple.

stgit needs some patches for git-1.6 also upstream.

--
Reini Urban
http://phpwiki.org/  http://murbreak.at/
difforig /usr/lib/python2.5/site-packages/stgit

diff -u  /usr/lib/python2.5/site-packages/stgit/basedir.py.orig
--- /usr/lib/python2.5/site-packages/stgit/basedir.py.orig	2006-06-11 12:33:58.001000000 +0000
+++ /usr/lib/python2.5/site-packages/stgit/basedir.py	2008-12-15 18:35:56.021375000 +0000
@@ -39,7 +39,7 @@
         if 'GIT_DIR' in os.environ:
             __base_dir = os.environ['GIT_DIR']
         else:
-            __base_dir = __output('git-rev-parse --git-dir 2> /dev/null')
+            __base_dir = __output('git rev-parse --git-dir 2> /dev/null')
 
     return __base_dir
 
diff -u  /usr/lib/python2.5/site-packages/stgit/commands/diff.py.orig
--- /usr/lib/python2.5/site-packages/stgit/commands/diff.py.orig	2008-12-15 18:48:57.958875000 +0000
+++ /usr/lib/python2.5/site-packages/stgit/commands/diff.py	2008-12-15 18:46:22.662000000 +0000
@@ -45,7 +45,7 @@
                        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')]
diff -u  /usr/lib/python2.5/site-packages/stgit/commands/export.py.orig
--- /usr/lib/python2.5/site-packages/stgit/commands/export.py.orig	2008-12-15 18:49:19.708875000 +0000
+++ /usr/lib/python2.5/site-packages/stgit/commands/export.py	2008-12-15 18:46:22.662000000 +0000
@@ -63,7 +63,7 @@
            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')]
diff -u  /usr/lib/python2.5/site-packages/stgit/commands/files.py.orig
--- /usr/lib/python2.5/site-packages/stgit/commands/files.py.orig	2008-12-15 18:49:42.333875000 +0000
+++ /usr/lib/python2.5/site-packages/stgit/commands/files.py	2008-12-15 18:46:22.662000000 +0000
@@ -39,7 +39,7 @@
            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')]
diff -u  /usr/lib/python2.5/site-packages/stgit/commands/pick.py.orig
--- /usr/lib/python2.5/site-packages/stgit/commands/pick.py.orig	2008-12-15 18:46:14.099500000 +0000
+++ /usr/lib/python2.5/site-packages/stgit/commands/pick.py	2008-12-15 18:46:22.693250000 +0000
@@ -96,7 +96,7 @@
     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)
 
diff -u  /usr/lib/python2.5/site-packages/stgit/config.py.orig
--- /usr/lib/python2.5/site-packages/stgit/config.py.orig	2007-05-21 21:05:00.001000000 +0000
+++ /usr/lib/python2.5/site-packages/stgit/config.py	2008-12-15 18:34:52.505750000 +0000
@@ -29,8 +29,8 @@
         'stgit.autoresolved':	'no',
         'stgit.smtpserver':	'localhost:25',
         'stgit.smtpdelay':	'5',
-        'stgit.pullcmd':	'git-pull',
-        'stgit.fetchcmd':	'git-fetch',
+        'stgit.pullcmd':	'git pull',
+        'stgit.fetchcmd':	'git fetch',
         'stgit.pull-policy':	'pull',
         'stgit.merger':		'diff3 -L current -L ancestor -L patched -m -E ' \
 				'"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"',
@@ -98,15 +98,15 @@
             raise GitConfigException, 'Value for "%s" is not an integer: "%s"' % (name, value)
 
     def rename_section(self, from_name, to_name):
-        self.__run('git-repo-config --rename-section', [from_name, to_name])
+        self.__run('git repo-config --rename-section', [from_name, to_name])
         self.__cache.clear()
 
     def set(self, name, value):
-        self.__run('git-repo-config', [name, value])
+        self.__run('git repo-config', [name, value])
         self.__cache[name] = value
 
     def unset(self, name):
-        self.__run('git-repo-config --unset', [name])
+        self.__run('git repo-config --unset', [name])
         self.__cache[name] = None
 
     def sections_matching(self, regexp):
diff -u  /usr/lib/python2.5/site-packages/stgit/git.py.orig
--- /usr/lib/python2.5/site-packages/stgit/git.py.orig	2007-07-16 22:52:48.001000000 +0000
+++ /usr/lib/python2.5/site-packages/stgit/git.py	2008-12-15 18:43:41.021375000 +0000
@@ -74,7 +74,7 @@
     def __init__(self, id_hash):
         self.__id_hash = id_hash
 
-        lines = _output_lines(['git-cat-file', 'commit', id_hash])
+        lines = _output_lines(['git cat-file', 'commit', id_hash])
         for i in range(len(lines)):
             line = lines[i]
             if line == '\n':
@@ -102,7 +102,7 @@
             return None
 
     def get_parents(self):
-        return _output_lines(['git-rev-list', '--parents', '--max-count=1',
+        return _output_lines(['git rev-list', '--parents', '--max-count=1',
                               self.__id_hash])[0].split()[1:]
 
     def get_author(self):
@@ -243,7 +243,7 @@
         if noexclude:
             extra_exclude = base_exclude = []
 
-        lines = _output_lines(['git-ls-files', '--others', '--directory']
+        lines = _output_lines(['git ls-files', '--others', '--directory']
                         + base_exclude + extra_exclude)
         cache_files += [('?', line.strip()) for line in lines]
 
@@ -254,7 +254,7 @@
     cache_files += [('C', filename) for filename in conflicts]
 
     # the rest
-    for line in _output_lines(['git-diff-index'] + diff_flags +
+    for line in _output_lines(['git diff-index'] + diff_flags +
                               [ tree_id, '--'] + files):
         fs = tuple(line.rstrip().split(' ',4)[-1].split('\t',1))
         if fs[1] not in conflicts:
@@ -286,7 +286,7 @@
     """Returns the name of the file pointed to by the HEAD link
     """
     return strip_prefix('refs/heads/',
-                        _output_one_line(['git-symbolic-ref', 'HEAD']))
+                        _output_one_line(['git symbolic-ref', 'HEAD']))
 
 def set_head_file(ref):
     """Resets HEAD to point to a new ref
@@ -294,13 +294,13 @@
     # head cache flushing is needed since we might have a different value
     # in the new head
     __clear_head_cache()
-    if __run('git-symbolic-ref HEAD',
+    if __run('git symbolic-ref HEAD',
              [os.path.join('refs', 'heads', ref)]) != 0:
         raise GitException, 'Could not set head to "%s"' % ref
 
 def set_branch(branch, val):
     """Point branch at a new commit object."""
-    if __run('git-update-ref', [branch, val]) != 0:
+    if __run('git update-ref', [branch, val]) != 0:
         raise GitException, 'Could not update %s to "%s".' % (branch, val)
 
 def __set_head(val):
@@ -325,13 +325,13 @@
 def refresh_index():
     """Refresh index with stat() information from the working directory.
     """
-    __run('git-update-index -q --unmerged --refresh')
+    __run('git update-index -q --unmerged --refresh')
 
 def rev_parse(git_id):
     """Parse the string and return a verified SHA1 id
     """
     try:
-        return _output_one_line(['git-rev-parse', '--verify', git_id])
+        return _output_one_line(['git rev-parse', '--verify', git_id])
     except GitException:
         raise GitException, 'Unknown revision: %s' % git_id
 
@@ -339,7 +339,7 @@
     """Existence check for the named branch
     """
     branch = os.path.join('refs', 'heads', branch)
-    for line in _output_lines('git-rev-parse --symbolic --all 2>&1'):
+    for line in _output_lines('git rev-parse --symbolic --all 2>&1'):
         if line.strip() == branch:
             return True
         if re.compile('[ |/]'+branch+' ').search(line):
@@ -375,8 +375,8 @@
                         + '^{commit}')
     if tree_id != get_head():
         refresh_index()
-        if __run('git-read-tree -u -m', [get_head(), tree_id]) != 0:
-            raise GitException, 'git-read-tree failed (local changes maybe?)'
+        if __run('git read-tree -u -m', [get_head(), tree_id]) != 0:
+            raise GitException, 'git read-tree failed (local changes maybe?)'
         __head = tree_id
     set_head_file(new_branch)
 
@@ -430,16 +430,16 @@
             raise GitException, '%s is not a file or directory' % i
 
     if files:
-        if __run('git-update-index --add --', files):
+        if __run('git update-index --add --', files):
             raise GitException, 'Unable to add file'
 
 def __copy_single(source, target, target2=''):
     """Copy file or dir named 'source' to name target+target2"""
 
     # "source" (file or dir) must match one or more git-controlled file
-    realfiles = _output_lines(['git-ls-files', source])
+    realfiles = _output_lines(['git ls-files', source])
     if len(realfiles) == 0:
-        raise GitException, '"%s" matches no git-controled files' % source
+        raise GitException, '"%s" matches no git-controlled files' % source
 
     if os.path.isdir(source):
         # physically copy the files, and record them to add them in one run
@@ -505,10 +505,10 @@
             if os.path.exists(f):
                 raise GitException, '%s exists. Remove it first' %f
         if files:
-            __run('git-update-index --remove --', files)
+            __run('git update-index --remove --', files)
     else:
         if files:
-            __run('git-update-index --force-remove --', files)
+            __run('git update-index --force-remove --', files)
 
 # Persons caching
 __user = None
@@ -583,12 +583,12 @@
     rm_files =  [x[1] for x in cache_files if x[0] in ['D']]
     m_files =   [x[1] for x in cache_files if x[0] in ['M']]
 
-    if add_files and __run('git-update-index --add --', add_files) != 0:
-        raise GitException, 'Failed git-update-index --add'
-    if rm_files and __run('git-update-index --force-remove --', rm_files) != 0:
-        raise GitException, 'Failed git-update-index --rm'
-    if m_files and __run('git-update-index --', m_files) != 0:
-        raise GitException, 'Failed git-update-index'
+    if add_files and __run('git update-index --add --', add_files) != 0:
+        raise GitException, 'Failed git update-index --add'
+    if rm_files and __run('git update-index --force-remove --', rm_files) != 0:
+        raise GitException, 'Failed git update-index --rm'
+    if m_files and __run('git update-index --', m_files) != 0:
+        raise GitException, 'Failed git update-index'
 
     return True
 
@@ -617,7 +617,7 @@
 
     # write the index to repository
     if tree_id == None:
-        tree_id = _output_one_line(['git-write-tree'])
+        tree_id = _output_one_line(['git write-tree'])
         set_head = True
 
     # the commit
@@ -632,7 +632,7 @@
         cmd += ['GIT_COMMITTER_NAME=%s' % committer_name]
     if committer_email:
         cmd += ['GIT_COMMITTER_EMAIL=%s' % committer_email]
-    cmd += ['git-commit-tree', tree_id]
+    cmd += ['git commit-tree', tree_id]
 
     # get the parents
     for p in parents:
@@ -661,7 +661,7 @@
     diff_str = diff(files, rev1, rev2)
     if diff_str:
         try:
-            _input_str(['git-apply'] + index_opt, diff_str)
+            _input_str(['git apply'] + index_opt, diff_str)
         except GitException:
             return False
 
@@ -679,7 +679,7 @@
         # general when pushing or picking patches)
         try:
             # use _output() to mask the verbose prints of the tool
-            _output(['git-merge-recursive', base, '--', head1, head2])
+            _output(['git merge-recursive', base, '--', head1, head2])
         except GitException, ex:
             err_output = str(ex)
             pass
@@ -687,15 +687,15 @@
         # the fast case where we don't track renames (used when the
         # distance between base and heads is small, i.e. folding or
         # synchronising patches)
-        if __run('git-read-tree -u -m --aggressive',
+        if __run('git read-tree -u -m --aggressive',
                  [base, head1, head2]) != 0:
-            raise GitException, 'git-read-tree failed (local changes maybe?)'
+            raise GitException, 'git read-tree failed (local changes maybe?)'
 
     # check the index for unmerged entries
     files = {}
     stages_re = re.compile('^([0-7]+) ([0-9a-f]{40}) ([1-3])\t(.*)$', re.S)
 
-    for line in _output(['git-ls-files', '--unmerged', '--stage', '-z']).split('\0'):
+    for line in _output(['git ls-files', '--unmerged', '--stage', '-z']).split('\0'):
         if not line:
             continue
 
@@ -778,15 +778,15 @@
         files = []
 
     if rev1 and rev2:
-        diff_str = _output(['git-diff-tree', '-p'] + diff_flags
+        diff_str = _output(['git diff-tree', '-p'] + diff_flags
                            + [rev1, rev2, '--'] + files)
     elif rev1 or rev2:
         refresh_index()
         if rev2:
-            diff_str = _output(['git-diff-index', '-p', '-R']
+            diff_str = _output(['git diff-index', '-p', '-R']
                                + diff_flags + [rev2, '--'] + files)
         else:
-            diff_str = _output(['git-diff-index', '-p']
+            diff_str = _output(['git diff-index', '-p']
                                + diff_flags + [rev1, '--'] + files)
     else:
         diff_str = ''
@@ -802,7 +802,7 @@
     if not files:
         files = []
 
-    p=popen2.Popen3('git-apply --stat')
+    p=popen2.Popen3('git apply --stat')
     diff(files, rev1, rev2, p.tochild)
     p.tochild.close()
     diff_str = p.fromchild.read().rstrip()
@@ -815,7 +815,7 @@
     """
 
     result = ''
-    for line in _output_lines(['git-diff-tree'] + diff_flags + ['-r', rev1, rev2]):
+    for line in _output_lines(['git diff-tree'] + diff_flags + ['-r', rev1, rev2]):
         result += '%s %s\n' % tuple(line.rstrip().split(' ',4)[-1].split('\t',1))
 
     return result.rstrip()
@@ -825,7 +825,7 @@
     """
 
     result = ''
-    for line in _output_lines(['git-diff-tree', '-r', rev1, rev2]):
+    for line in _output_lines(['git diff-tree', '-r', rev1, rev2]):
         result += '%s\n' % line.rstrip().split(' ',4)[-1].split('\t',1)[-1]
 
     return result.rstrip()
@@ -833,7 +833,7 @@
 def pretty_commit(commit_id = 'HEAD', diff_flags = []):
     """Return a given commit (log + diff)
     """
-    return _output(['git-diff-tree'] + diff_flags +
+    return _output(['git diff-tree'] + diff_flags +
                    ['--cc', '--always', '--pretty', '-r', commit_id])
 
 def checkout(files = None, tree_id = None, force = False):
@@ -842,10 +842,10 @@
     if not files:
         files = []
 
-    if tree_id and __run('git-read-tree --reset', [tree_id]) != 0:
-        raise GitException, 'Failed git-read-tree --reset %s' % tree_id
+    if tree_id and __run('git read-tree --reset', [tree_id]) != 0:
+        raise GitException, 'Failed git read-tree --reset %s' % tree_id
 
-    checkout_cmd = 'git-checkout-index -q -u'
+    checkout_cmd = 'git checkout-index -q -u'
     if force:
         checkout_cmd += ' -f'
     if len(files) == 0:
@@ -854,15 +854,15 @@
         checkout_cmd += ' --'
 
     if __run(checkout_cmd, files) != 0:
-        raise GitException, 'Failed git-checkout-index'
+        raise GitException, 'Failed git checkout-index'
 
 def switch(tree_id, keep = False):
     """Switch the tree to the given id
     """
     if not keep:
         refresh_index()
-        if __run('git-read-tree -u -m', [get_head(), tree_id]) != 0:
-            raise GitException, 'git-read-tree failed (local changes maybe?)'
+        if __run('git read-tree -u -m', [get_head(), tree_id]) != 0:
+            raise GitException, 'git read-tree failed (local changes maybe?)'
 
     __set_head(tree_id)
 
@@ -887,7 +887,7 @@
         __set_head(tree_id)
 
 def fetch(repository = 'origin', refspec = None):
-    """Fetches changes from the remote repository, using 'git-fetch'
+    """Fetches changes from the remote repository, using 'git fetch'
     by default.
     """
     # we update the HEAD
@@ -903,7 +903,7 @@
         raise GitException, 'Failed "%s %s"' % (command, repository)
 
 def pull(repository = 'origin', refspec = None):
-    """Fetches changes from the remote repository, using 'git-pull'
+    """Fetches changes from the remote repository, using 'git pull'
     by default.
     """
     # we update the HEAD
@@ -921,7 +921,7 @@
 def repack():
     """Repack all objects into a single pack
     """
-    __run('git-repack -a -d -f')
+    __run('git repack -a -d -f')
 
 def apply_patch(filename = None, diff = None, base = None,
                 fail_dump = True):
@@ -944,7 +944,7 @@
         refresh_index()
 
     try:
-        _input_str(['git-apply', '--index'], diff)
+        _input_str(['git apply', '--index'], diff)
     except GitException:
         if base:
             switch(orig_head)
@@ -965,16 +965,16 @@
 
 def clone(repository, local_dir):
     """Clone a remote repository. At the moment, just use the
-    'git-clone' script
+    'git clone' script
     """
-    if __run('git-clone', [repository, local_dir]) != 0:
-        raise GitException, 'Failed "git-clone %s %s"' \
+    if __run('git clone', [repository, local_dir]) != 0:
+        raise GitException, 'Failed "git clone %s %s"' \
               % (repository, local_dir)
 
 def modifying_revs(files, base_rev, head_rev):
     """Return the revisions from the list modifying the given files
     """
-    cmd = ['git-rev-list', '%s..%s' % (base_rev, head_rev), '--']
+    cmd = ['git rev-list', '%s..%s' % (base_rev, head_rev), '--']
     revs = [line.strip() for line in _output_lines(cmd + files)]
 
     return revs
@@ -1073,4 +1073,4 @@
     """Return a list of all refs in the current repository.
     """
 
-    return [line.split()[1] for line in _output_lines(['git-show-ref'])]
+    return [line.split()[1] for line in _output_lines(['git show-ref'])]
diff -u  /usr/lib/python2.5/site-packages/stgit/gitmergeonefile.py.orig
--- /usr/lib/python2.5/site-packages/stgit/gitmergeonefile.py.orig	2007-06-22 22:01:52.001000000 +0000
+++ /usr/lib/python2.5/site-packages/stgit/gitmergeonefile.py	2008-12-15 18:36:27.490125000 +0000
@@ -61,24 +61,24 @@
 
     if orig_hash:
         orig = path + extensions['ancestor']
-        tmp = __output('git-unpack-file %s' % orig_hash)
+        tmp = __output('git unpack-file %s' % orig_hash)
         os.chmod(tmp, int(orig_mode, 8))
         os.renames(tmp, orig)
     if file1_hash:
         src1 = path + extensions['current']
-        tmp = __output('git-unpack-file %s' % file1_hash)
+        tmp = __output('git unpack-file %s' % file1_hash)
         os.chmod(tmp, int(file1_mode, 8))
         os.renames(tmp, src1)
     if file2_hash:
         src2 = path + extensions['patched']
-        tmp = __output('git-unpack-file %s' % file2_hash)
+        tmp = __output('git unpack-file %s' % file2_hash)
         os.chmod(tmp, int(file2_mode, 8))
         os.renames(tmp, src2)
 
     if file1_hash and not os.path.exists(path):
         # the current file might be removed by GIT when it is a new
         # file added in both branches. Just re-generate it
-        tmp = __output('git-unpack-file %s' % file1_hash)
+        tmp = __output('git unpack-file %s' % file1_hash)
         os.chmod(tmp, int(file1_mode, 8))
         os.renames(tmp, path)
 
@@ -163,13 +163,13 @@
         if file1_hash and file2_hash:
             # 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'
+                if os.system('git update-index --cacheinfo %s %s %s'
                              % (file1_mode, file1_hash, path)) != 0:
-                    out.error('git-update-index failed')
+                    out.error('git update-index failed')
                     __conflict(path)
                     return 1
-                if os.system('git-checkout-index -u -f -- %s' % path):
-                    out.error('git-checkout-index failed')
+                if os.system('git checkout-index -u -f -- %s' % path):
+                    out.error('git checkout-index failed')
                     __conflict(path)
                     return 1
                 if file1_mode != file2_mode:
@@ -184,14 +184,14 @@
                                                     'output': path }) == 0
 
                 if merge_ok:
-                    os.system('git-update-index -- %s' % path)
+                    os.system('git update-index -- %s' % path)
                     __remove_files(orig_hash, file1_hash, file2_hash)
                     return 0
                 else:
                     out.error('Three-way merge tool failed for file "%s"'
                               % path)
                     # reset the cache to the first branch
-                    os.system('git-update-index --cacheinfo %s %s %s'
+                    os.system('git update-index --cacheinfo %s %s %s'
                               % (file1_mode, file1_hash, path))
 
                     if config.get('stgit.autoimerge') == 'yes':
@@ -206,7 +206,7 @@
                             __conflict(path)
                             return 1
                         # successful interactive merge
-                        os.system('git-update-index -- %s' % path)
+                        os.system('git update-index -- %s' % path)
                         __remove_files(orig_hash, file1_hash, file2_hash)
                         return 0
                     else:
@@ -222,7 +222,7 @@
             if os.path.exists(path):
                 os.remove(path)
             __remove_files(orig_hash, file1_hash, file2_hash)
-            return os.system('git-update-index --remove -- %s' % path)
+            return os.system('git update-index --remove -- %s' % path)
         # file deleted in one and changed in the other
         else:
             # Do something here - we must at least merge the entry in
@@ -230,14 +230,14 @@
             # fact, stg resolved does not handle that.
 
             # Do the same thing cogito does - remove the file in any case.
-            os.system('git-update-index --remove -- %s' % path)
+            os.system('git update-index --remove -- %s' % path)
 
             #if file1_hash:
                 ## file deleted upstream and changed in the patch. The
                 ## patch is probably going to move the changes
                 ## elsewhere.
 
-                #os.system('git-update-index --remove -- %s' % path)
+                #os.system('git update-index --remove -- %s' % path)
             #else:
                 ## file deleted in the patch and changed upstream. We
                 ## could re-delete it, but for now leave it there -
@@ -245,7 +245,7 @@
                 ## the file.
 
                 ## reset the cache to the first branch
-                #os.system('git-update-index --cacheinfo %s %s %s'
+                #os.system('git update-index --cacheinfo %s %s %s'
                 #          % (file1_mode, file1_hash, path))
             __conflict(path)
             return 1
@@ -256,13 +256,13 @@
         if file1_hash and file2_hash:
             # files are the same
             if file1_hash == file2_hash:
-                if os.system('git-update-index --add --cacheinfo %s %s %s'
+                if os.system('git update-index --add --cacheinfo %s %s %s'
                              % (file1_mode, file1_hash, path)) != 0:
-                    out.error('git-update-index failed')
+                    out.error('git update-index failed')
                     __conflict(path)
                     return 1
-                if os.system('git-checkout-index -u -f -- %s' % path):
-                    out.error('git-checkout-index failed')
+                if os.system('git checkout-index -u -f -- %s' % path):
+                    out.error('git checkout-index failed')
                     __conflict(path)
                     return 1
                 if file1_mode != file2_mode:
@@ -274,7 +274,7 @@
             else:
                 out.error('File "%s" added in branches but different' % path)
                 # reset the cache to the first branch
-                os.system('git-update-index --cacheinfo %s %s %s'
+                os.system('git update-index --cacheinfo %s %s %s'
                           % (file1_mode, file1_hash, path))
 
                 if config.get('stgit.autoimerge') == 'yes':
@@ -289,7 +289,7 @@
                         __conflict(path)
                         return 1
                     # successful interactive merge
-                    os.system('git-update-index -- %s' % path)
+                    os.system('git update-index -- %s' % path)
                     __remove_files(orig_hash, file1_hash, file2_hash)
                     return 0
                 else:
@@ -306,13 +306,13 @@
             else:
                 mode = file2_mode
                 obj = file2_hash
-            if os.system('git-update-index --add --cacheinfo %s %s %s'
+            if os.system('git update-index --add --cacheinfo %s %s %s'
                          % (mode, obj, path)) != 0:
-                out.error('git-update-index failed')
+                out.error('git update-index failed')
                 __conflict(path)
                 return 1
             __remove_files(orig_hash, file1_hash, file2_hash)
-            return os.system('git-checkout-index -u -f -- %s' % path)
+            return os.system('git checkout-index -u -f -- %s' % path)
 
     # Unhandled case
     out.error('Unhandled merge conflict: "%s" "%s" "%s" "%s" "%s" "%s" "%s"'

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Problem reports:       http://cygwin.com/problems.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]