diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-08-22 10:28:55 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-08-22 10:28:55 +0400 |
commit | b95d0a2f8cb2923fed417e649a66c7372b968248 (patch) | |
tree | dfeb2f5f2e8c756d34cece809ff0f7ef428c9fda /cache.h | |
parent | dfdb1e4150fb9c9ee86186e89987dc565bc91ead (diff) | |
parent | ad9ac6db5d58de08d0497b9184e86926377c20dd (diff) |
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.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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); |