mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move set_porcelain_error_msgs to unpack-trees.c and rename it

Browse Source 
The function is currently dealing only with error messages, but the
intent of calling it is really to notify the unpack-tree mechanics that
it is running in porcelain mode.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matthieu Moy
2010-09-02 13:57:33 +02:00
committed by Junio C Hamano
parent e935e62a0f
commit dc1166e685
6 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
merge-recursive.h
View File

@ -23,12 +23,6 @@ struct merge_options {
struct string_list current_directory_set;
};
/*
* Sets the list of user-friendly error messages to be used by the
* command "cmd" (either merge or checkout)
*/
void set_porcelain_error_msgs(const char **msgs, const char *cmd);
/* merge_trees() but with recursive ancestor consolidation */
int merge_recursive(struct merge_options *o,
struct commit *h1,