path: root/advice.h
diff options
authorPaul Tan <>2015-06-18 10:54:04 (GMT)
committerJunio C Hamano <>2015-06-18 20:17:16 (GMT)
commit4a4cf9e821f604b79817bc37b475828f3fb8b0a4 (patch)
tree99cb30bd03852e51ee2a2077c8a26815cfdc40ab /advice.h
parenta9de98975479ef7d42986db63c16251c1f87ebcb (diff)
pull: check if in unresolved merge state
Since d38a30d (Be more user-friendly when refusing to do something because of conflict., 2010-01-12), git-pull will error out with user-friendly advices if the user is in the middle of a merge or has unmerged files. Re-implement this behavior. While the "has unmerged files" case can be handled by die_resolve_conflict(), we introduce a new function die_conclude_merge() for printing a different error message for when there are no unmerged files but the merge has not been finished. Signed-off-by: Paul Tan <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'advice.h')
1 files changed, 1 insertions, 0 deletions
diff --git a/advice.h b/advice.h
index 5ecc6c1..b341a55 100644
--- a/advice.h
+++ b/advice.h
@@ -24,6 +24,7 @@ __attribute__((format (printf, 1, 2)))
void advise(const char *advice, ...);
int error_resolve_conflict(const char *me);
extern void NORETURN die_resolve_conflict(const char *me);
+void NORETURN die_conclude_merge(void);
void detach_advice(const char *new_name);
#endif /* ADVICE_H */