summaryrefslogtreecommitdiff
path: root/unpack-trees.h
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2010-09-02 13:57:33 +0200
committerJunio C Hamano <gitster@pobox.com>2010-09-03 09:31:28 -0700
commitdc1166e685dc54946ea4600e962e56a965962ec2 (patch)
tree32c6807e0344a44b108fa3382278af0f41b51ea7 /unpack-trees.h
parente935e62a0fd26ff1f29a98a4ca8fa693f42357a2 (diff)
downloadgit-dc1166e685dc54946ea4600e962e56a965962ec2.tar.gz
Move set_porcelain_error_msgs to unpack-trees.c and rename it
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>
Diffstat (limited to 'unpack-trees.h')
-rw-r--r--unpack-trees.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h
index 6e049b0997..d62bba9baa 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -22,6 +22,12 @@ 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)
+ */
+void setup_unpack_trees_porcelain(const char **msgs, const char *cmd);
+
struct rejected_paths_list {
char *path;
struct rejected_paths_list *next;