Merge branch 'master' into core-updates

1 files changed, 7 insertions, 1 deletions

diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm
index b6287d3a4c..fa6b6cae37 100644
--- a/guix/scripts/describe.scm
+++ b/guix/scripts/describe.scm
@@ -18,6 +18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (guix scripts describe)
+  #:use-module ((guix config) #:select (%guix-version))
   #:use-module ((guix ui) #:hide (display-profile-content))
   #:use-module (guix channels)
   #:use-module (guix scripts)
@@ -114,7 +115,12 @@ within a Git checkout."
                        (lambda ()
                          (repository-discover (dirname program)))
                        (lambda (key err)
-                         (leave (G_ "failed to determine origin~%")))))
+                         (report-error (G_ "failed to determine origin~%"))
+                         (display-hint (format #f (G_ "Perhaps this
+@command{guix} command was not obtained with @command{guix pull}?  Its version
+string is ~a.~%")
+                                               %guix-version))
+                         (exit 1))))
          (repository (repository-open directory))
          (head       (repository-head repository))
          (commit     (oid->string (reference-target head))))