Improve error message about fetch into current branch

raalkml · gitster · commit 26284f9356f4 · 2009-03-22T17:13:08.000-07:00
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 &lt;raa.lkml@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin-fetch.c b/builtin-fetch.c
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -544,7 +544,8 @@ static void check_not_current_branch(struct ref *ref_map)`
`544`	`544`	`for (; ref_map; ref_map = ref_map->next)`
`545`	`545`	`if (ref_map->peer_ref && !strcmp(current_branch->refname,`
`546`	`546`	`ref_map->peer_ref->name))`
`547`		`- die("Refusing to fetch into current branch");`
	`547`	`+ die("Refusing to fetch into current branch %s "`
	`548`	`+ "of non-bare repository", current_branch->refname);`
`548`	`549`	`}`
`549`	`550`
`550`	`551`	`static int do_fetch(struct transport *transport,`