diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-08-23 15:34:31 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-23 15:34:31 -0700 |
commit | 6133e4da549efbda98565163705af0781b096a4c (patch) | |
tree | c1927b6f9096f182bd48c66fb91e93c616f2b29e /cache.h | |
parent | d0b46502de2893a121427b94321a2bfc8cffde27 (diff) | |
parent | 0f64bfa9567f697d6152ef9ea937d4b573029a08 (diff) | |
download | git-6133e4da549efbda98565163705af0781b096a4c.tar.gz |
Merge branch 'cb/maint-ls-files-error-report'
* cb/maint-ls-files-error-report:
ls-files: fix pathspec display on error
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1195,7 +1195,7 @@ extern int ws_blank_line(const char *line, int len, unsigned ws_rule); #define ws_tab_width(rule) ((rule) & WS_TAB_WIDTH_MASK) /* ls-files */ -int report_path_error(const char *ps_matched, const char **pathspec, int prefix_offset); +int report_path_error(const char *ps_matched, const char **pathspec, const char *prefix); void overlay_tree_on_cache(const char *tree_name, const char *prefix); char *alias_lookup(const char *alias); |