summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-21 23:28:55 -0700
committerJunio C Hamano <gitster@pobox.com>2010-08-21 23:28:55 -0700
commitb95d0a2f8cb2923fed417e649a66c7372b968248 (patch)
treedfeb2f5f2e8c756d34cece809ff0f7ef428c9fda /cache.h
parentdfdb1e4150fb9c9ee86186e89987dc565bc91ead (diff)
parentad9ac6db5d58de08d0497b9184e86926377c20dd (diff)
downloadgit-b95d0a2f8cb2923fed417e649a66c7372b968248.tar.gz
Merge branch 'gb/split-cmdline-errmsg'
* gb/split-cmdline-errmsg: split_cmdline: Allow caller to access error string
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 61a563150f..eb77e1df48 100644
--- a/cache.h
+++ b/cache.h
@@ -1099,6 +1099,8 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix);
char *alias_lookup(const char *alias);
int split_cmdline(char *cmdline, const char ***argv);
+/* Takes a negative value returned by split_cmdline */
+const char *split_cmdline_strerror(int cmdline_errno);
/* builtin/merge.c */
int checkout_fast_forward(const unsigned char *from, const unsigned char *to);