diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-03 22:23:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 22:23:49 -0700 |
| commit | c208e05bd9880028c980fafbc5dda3d17a603ac1 (patch) | |
| tree | 25d587aacf885345b2b001bc006ac3871b5c7a4b /unpack-trees.h | |
| parent | f92d62ec4ead67109418483b65aaf158b7462121 (diff) | |
| parent | c5978a507ca20b12008724f78237784193fb9489 (diff) | |
| download | git-c208e05bd9880028c980fafbc5dda3d17a603ac1.tar.gz | |
Merge branch 'dg/local-mod-error-messages'
* dg/local-mod-error-messages:
t7609-merge-co-error-msgs: test non-fast forward case too.
Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
setup_unpack_trees_porcelain: take the whole options struct as parameter
Move set_porcelain_error_msgs to unpack-trees.c and rename it
Conflicts:
merge-recursive.c
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index 6e049b0997..7c0187d11a 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -22,6 +22,13 @@ enum unpack_trees_error_types { NB_UNPACK_TREES_ERROR_TYPES }; +/* + * Sets the list of user-friendly error messages to be used by the + * command "cmd" (either merge or checkout), and show_all_errors to 1. + */ +void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, + const char *cmd); + struct rejected_paths_list { char *path; struct rejected_paths_list *next; |