development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

fetch: give a hint to the user when local refs fail to update

Browse source 
There are basically two categories of update failures for
local refs:

  1. problems outside of git, like disk full, bad
     permissions, etc.

  2. D/F conflicts on tracking branch ref names

In either case, there should already have been an error
message. In case '1', hopefully enough information has
already been given that the user can fix it. In the case of
'2', we can hint that the user can clean up their tracking
branch area by using 'git remote prune'.

Note that we don't actually know _which_ case we have, so
the user will receive the hint in case 1, as well. In this
case the suggestion won't do any good, but hopefully the
user is smart enough to figure out that it's just a hint.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2008-06-27 00:01:41 -04:00 committed by Junio C Hamano
parent 6315472eed
commit f3cb169bc9
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
builtin-fetch.c
View file

@ -181,9 +181,9 @@ static int s_update_ref(const char *action,
lock = lock_any_ref_for_update(ref->name, lock = lock_any_ref_for_update(ref->name,
check_old ? ref->old_sha1 : NULL, 0); check_old ? ref->old_sha1 : NULL, 0);
if (!lock) if (!lock)
return 1; return 2;
if (write_ref_sha1(lock, ref->new_sha1, msg) < 0) if (write_ref_sha1(lock, ref->new_sha1, msg) < 0)
return 1; return 2;
return 0; return 0;
} }
@ -294,7 +294,8 @@ static int update_local_ref(struct ref *ref,
} }
} }
static int store_updated_refs(const char *url, struct ref *ref_map) static int store_updated_refs(const char *url, const char *remote_name,
struct ref *ref_map)
{ {
FILE *fp; FILE *fp;
struct commit *commit; struct commit *commit;
@ -380,6 +381,10 @@ static int store_updated_refs(const char *url, struct ref *ref_map)
} }
} }
fclose(fp); fclose(fp);
if (rc & 2)
error("some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting "
"branches", remote_name);
return rc; return rc;
} }
@ -450,7 +455,9 @@ static int fetch_refs(struct transport *transport, struct ref *ref_map)
if (ret) if (ret)
ret = transport_fetch_refs(transport, ref_map); ret = transport_fetch_refs(transport, ref_map);
if (!ret) if (!ret)
ret |= store_updated_refs(transport->url, ref_map); ret |= store_updated_refs(transport->url,
transport->remote->name,
ref_map);
transport_unlock_pack(transport); transport_unlock_pack(transport);
return ret; return ret;
} }