https://github.com/git/git
Revision d78b7eb2d50bd1cf57d7f06c1b4bdd8e08057926 authored by Junio C Hamano on 22 March 2018, 21:24:12 UTC, committed by Junio C Hamano on 22 March 2018, 21:24:12 UTC
Plug recently introduced leaks in fsck.

* jt/fsck-code-cleanup:
  fsck: fix leak when traversing trees
2 parent s 34b9ec8 + ba3a08c
Raw File
Tip revision: d78b7eb2d50bd1cf57d7f06c1b4bdd8e08057926 authored by Junio C Hamano on 22 March 2018, 21:24:12 UTC
Merge branch 'jt/fsck-code-cleanup' into maint
Tip revision: d78b7eb
advice.h
#ifndef ADVICE_H
#define ADVICE_H

#include "git-compat-util.h"

extern int advice_push_update_rejected;
extern int advice_push_non_ff_current;
extern int advice_push_non_ff_matching;
extern int advice_push_already_exists;
extern int advice_push_fetch_first;
extern int advice_push_needs_force;
extern int advice_status_hints;
extern int advice_status_u_option;
extern int advice_commit_before_merge;
extern int advice_resolve_conflict;
extern int advice_implicit_identity;
extern int advice_detached_head;
extern int advice_set_upstream_failure;
extern int advice_object_name_warning;
extern int advice_rm_hints;
extern int advice_add_embedded_repo;
extern int advice_ignored_hook;
extern int advice_waiting_for_editor;

int git_default_advice_config(const char *var, const char *value);
__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 */
back to top