author | Jeff King <peff@peff.net> | |
Fri, 27 Jun 2008 04:01:41 +0000 (00:01 -0400) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 30 Jun 2008 06:47:41 +0000 (23:47 -0700) | ||
commit | f3cb169bc9822e39a3efe637602b829cb338a213 | |
tree | 342da73fa874bf3de6dd166bc9100dfb98e46909 | tree | snapshot |
parent | 6315472eed9ff5f594560ddfd592ea21c665fe96 | commit | diff |
fetch: give a hint to the user when local refs fail to update
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>
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>
builtin-fetch.c | diff | blob | history |