diff options
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -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; |