diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-18 12:32:49 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-18 13:27:59 +0100 |
commit | 7031bce4c16fea6e76c48753162d07d6aeef3531 (patch) | |
tree | 9efee40b7c8f672c1b56b0bc0b56f54f7af0f5d7 | |
parent | 226518037ab030a717936762712a0d9431c04a6f (diff) |
fetch_from_archive: Return the hash (and update the comment)
All the call sites currently treat the return value as a boolean, and
the truthiness and falsishness of return values is unchanged, so there
is no overall functional change.
Also, clarify the head comment somewhat.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | dgit | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -1802,9 +1802,11 @@ sub mergeinfo_version ($) { } sub fetch_from_archive () { - # Ensures that lrref() is what is actually in the archive, - # one way or another. If there is nothing in the archive, - # leaves lrref alone and returns 0. + # Ensures that lrref() is what is actually in the archive, one way + # or another, according to us - ie this client's + # appropritaely-updated archive view. Also returns the commit id. + # If there is nothing in the archive, leaves lrref alone and + # returns undef. get_archive_dsc(); if ($dsc) { @@ -1998,7 +2000,7 @@ But we were not able to obtain any version from the archive or git. END } unshift @end, $del_lrfetchrefs; - return 0; + return undef; } if ($lastfetch_hash && @@ -2149,7 +2151,7 @@ END lrfetchref_used lrfetchref(); unshift @end, $del_lrfetchrefs; - return 1; + return $hash; } sub set_local_git_config ($$) { |