summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-27 09:46:47 -0700
committerJunio C Hamano <gitster@pobox.com>2010-08-27 09:46:47 -0700
commit1666246b702379275fe87cbbbf6111a74d00d825 (patch)
tree4fc58712bd97b618be4420fa0bf7f9e241ea8ef3 /cache.h
parent70256a3a6780a9fd181edf0bf0e762eb56637c9c (diff)
parentad9ac6db5d58de08d0497b9184e86926377c20dd (diff)
downloadgit-1666246b702379275fe87cbbbf6111a74d00d825.tar.gz
Merge branch 'gb/split-cmdline-errmsg' into gb/shell-ext
* 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 c9fa3df7f5..7466ad04fa 100644
--- a/cache.h
+++ b/cache.h
@@ -1096,6 +1096,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);