diff options
| -rwxr-xr-x | git-buildpackage | 2 | ||||
| -rwxr-xr-x | git-dch | 2 | ||||
| -rwxr-xr-x | git-import-dsc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/git-buildpackage b/git-buildpackage index fc3feba..422ae59 100755 --- a/git-buildpackage +++ b/git-buildpackage @@ -35,7 +35,7 @@ index_name = "INDEX" def git_archive_pipe(prefix, pipe, output, treeish): """run the git_archive pipe""" - pipe.prepend('git-archive --format=tar --prefix=%s/ %s' % (prefix, treeish), '.-') + pipe.prepend('git archive --format=tar --prefix=%s/ %s' % (prefix, treeish), '.-') try: ret = pipe.copy('', output) if ret: @@ -66,7 +66,7 @@ def fixup_trailer(): def head_commit(): """get the full sha1 of the last commit on HEAD""" - commit = subprocess.Popen([ 'git-log', 'HEAD^..' ], stdout=subprocess.PIPE).stdout + commit = subprocess.Popen([ 'git', 'log', 'HEAD^..' ], stdout=subprocess.PIPE).stdout sha = commit.readline().split()[-1] return sha diff --git a/git-import-dsc b/git-import-dsc index 018dbda..e7d9716 100755 --- a/git-import-dsc +++ b/git-import-dsc @@ -55,10 +55,10 @@ def import_initial(src, dirs, options): def git_apply_patch(diff): - "Import patch via git-apply" + "Import patch via git apply" pipe = pipes.Template() pipe.prepend('gunzip -c %s' % diff, '.-') - pipe.append('git-apply --index --apply --whitespace=nowarn -', '-.') + pipe.append('git apply --index --apply --whitespace=nowarn -', '-.') try: ret = pipe.copy('', '') if ret: |