diff options
| author | Stefan Beller <sbeller@google.com> | 2015-01-07 19:23:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-07 19:56:42 -0800 |
| commit | b6a4788586d8d1e88eee298c4a9a571416e50e3a (patch) | |
| tree | c97e3d66eca5c2ab7b39deb42af377cadba84f15 | |
| parent | a6a843196869659ee55238e474be29018987c4bf (diff) | |
| download | git-b6a4788586d8d1e88eee298c4a9a571416e50e3a.tar.gz | |
receive-pack.c: die instead of error in case of possible future bug
Discussion on the previous patch revealed we rather want to err on the
safe side. To do so we need to stop receive-pack in case of the possible
future bug when connectivity is not checked on a shallow push.
Also while touching that code we considered that removing the reported
refs may be harmful in some situations. Sound the message more like a
"This Cannot Happen, Please Investigate!" instead of giving advice to
remove refs.
Suggested-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/receive-pack.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 2ebaf6695f..3bdb1586d6 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1061,9 +1061,7 @@ static void warn_if_skipped_connectivity_check(struct command *commands, } } if (!checked_connectivity) - error("BUG: run 'git fsck' for safety.\n" - "If there are errors, try to remove " - "the reported refs above"); + die("BUG: connectivity check skipped???"); } static void execute_commands(struct command *commands, |