Revision da1fbed3fff6ed2d64399ff26d8a9ab3bcf00540 authored by Johannes Sixt on 30 March 2010, 17:36:03 UTC, committed by Junio C Hamano on 30 March 2010, 21:46:33 UTC
To make the code simpler, run_textconv lumps all of its error checking into one conditional. However, the short-circuit means that an error in reading will prevent us from calling finish_command, leaving a zombie child. Clean up properly after errors. Based-on-work-by: Jeff King <peff@peff.net> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 657ab61
advice.h
#ifndef ADVICE_H
#define ADVICE_H
#include "git-compat-util.h"
extern int advice_push_nonfastforward;
extern int advice_status_hints;
extern int advice_commit_before_merge;
extern int advice_resolve_conflict;
extern int advice_implicit_identity;
extern int advice_detached_head;
int git_default_advice_config(const char *var, const char *value);
extern void NORETURN die_resolve_conflict(const char *me);
#endif /* ADVICE_H */
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...