Code

Improve error message about fetch into current branch
authorAlex Riesen <raa.lkml@gmail.com>
Sun, 22 Mar 2009 22:07:33 +0000 (23:07 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Mar 2009 00:13:08 +0000 (17:13 -0700)
Otherwise, it is hard to guess why the fetch failed.
Make sure we at least mention that the repository must be bare.
Also the current branch is printed.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-fetch.c

index 7fb35fca9d1b57dacaebfd3cb9b2af4d035e750c..7293146525f525f628499744481796dad8a4a861 100644 (file)
@@ -544,7 +544,8 @@ static void check_not_current_branch(struct ref *ref_map)
        for (; ref_map; ref_map = ref_map->next)
                if (ref_map->peer_ref && !strcmp(current_branch->refname,
                                        ref_map->peer_ref->name))
-                       die("Refusing to fetch into current branch");
+                       die("Refusing to fetch into current branch %s "
+                           "of non-bare repository", current_branch->refname);
 }
 
 static int do_fetch(struct transport *transport,