From: Catalin Marinas Date: Thu, 6 Apr 2006 20:22:05 +0000 (+0100) Subject: Use 'git-*' instead of 'git *' X-Git-Tag: v0.14.3~512 X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/5d12e944baee8163ebf1eb3f24f5b706202da59c Use 'git-*' instead of 'git *' This is to avoid starting the shell twice, at least until the GIT people decide to no longer support the 'git-*' commands. Signed-off-by: Catalin Marinas --- diff --git a/stgit/git.py b/stgit/git.py index adad46f..d75b54e 100644 --- a/stgit/git.py +++ b/stgit/git.py @@ -649,17 +649,17 @@ def reset(files = None, tree_id = None, check_out = True): def pull(repository = 'origin', refspec = None): """Pull changes from the remote repository. At the moment, just - use the 'git pull' command + use the 'git-pull' command """ - # 'git pull' updates the HEAD + # 'git-pull' updates the HEAD __clear_head_cache() args = [repository] if refspec: args.append(refspec) - if __run('git pull', args) != 0: - raise GitException, 'Failed "git pull %s"' % repository + if __run('git-pull', args) != 0: + raise GitException, 'Failed "git-pull %s"' % repository def apply_patch(filename = None, base = None): """Apply a patch onto the current or given index. There must not @@ -693,10 +693,10 @@ def apply_patch(filename = None, base = None): 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):