"git-commond" vs. "git command" cleanup

Closes: #497335

diff --git a/git-buildpackage b/git-buildpackage
index fc3feba5541f7fd988b88e73689f47324ba40f6e..422ae59d208462c475f10e412249b927d616d297 100755 (executable)
--- 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:

diff --git a/git-dch b/git-dch
index ea732eb5f41c2407145ac7028b3cf48947e3d418..f0d6117aee19eb21717cadd14e052557daa19eef 100755 (executable)
--- a/git-dch
+++ b/git-dch
@@ -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 018dbdaf74be7f16944ecb717a4c8837be76e665..e7d97161b5e6cd977b157f917670eff38019e18c 100755 (executable)
--- 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: