From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 16 Oct 2016 11:52:01 +0000 (+0100)
Subject: git- prefixes: Change `git-foo' to `git foo' in messages
X-Git-Tag: archive/debian/2.1~8
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=15e4f14fee93878f5e6fa6ddd3e8ec13be907cbf

git- prefixes: Change `git-foo' to `git foo' in messages

No change other that to error messages, debug output, etc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index 04e61b82..0507899b 100755
--- a/dgit
+++ b/dgit
@@ -2103,7 +2103,7 @@ sub git_fetch_us () {
 	    my ($objid,$rrefname) = ($1,$2);
 	    if (!$wanted_rref->($rrefname)) {
 		print STDERR <<END;
-warning: git-ls-remote @look reported $rrefname; this is silly, ignoring it.
+warning: git ls-remote @look reported $rrefname; this is silly, ignoring it.
 END
 		next;
 	    }
@@ -2136,11 +2136,11 @@ END
 	    if (!exists $wantr{$rrefname}) {
 		if ($wanted_rref->($rrefname)) {
 		    printdebug <<END;
-git-fetch @fspecs created $lrefname which git-ls-remote @look didn't list.
+git-fetch @fspecs created $lrefname which git ls-remote @look didn't list.
 END
 		} else {
 		    print STDERR <<END
-warning: git-fetch @fspecs created $lrefname; this is silly, deleting it.
+warning: git fetch @fspecs created $lrefname; this is silly, deleting it.
 END
 		}
 		runcmd_ordryrun_local @git, qw(update-ref -d), $lrefname;
@@ -2155,24 +2155,24 @@ END
 	    next if $got eq $want;
 	    if (!defined $objgot{$want}) {
 		print STDERR <<END;
-warning: git-ls-remote suggests we want $lrefname
+warning: git ls-remote suggests we want $lrefname
 warning:  and it should refer to $want
-warning:  but git-fetch didn't fetch that object to any relevant ref.
+warning:  but git fetch didn't fetch that object to any relevant ref.
 warning:  This may be due to a race with someone updating the server.
 warning:  Will try again...
 END
 		next FETCH_ITERATION;
 	    }
 	    printdebug <<END;
-git-fetch @fspecs made $lrefname=$got but want git-ls-remote @look says $want
+git-fetch @fspecs made $lrefname=$got but want git ls-remote @look says $want
 END
 	    runcmd_ordryrun_local @git, qw(update-ref -m),
-		"dgit fetch git-fetch fixup", $lrefname, $want;
+		"dgit fetch git fetch fixup", $lrefname, $want;
 	    $lrfetchrefs_f{$lrefname} = $want;
 	}
 	last;
     }
-    printdebug "git_fetch_us: git-fetch --no-insane emulation complete\n",
+    printdebug "git_fetch_us: git fetch --no-insane emulation complete\n",
 	Dumper(\%lrfetchrefs_f);
 
     my %here;