diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-09-23 14:30:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-23 14:30:49 -0700 |
| commit | a0b1cb60ab296476084b3d4766a943e2d62719b8 (patch) | |
| tree | 76ae24f6eb6c2c7488e0c9ae7851ae378d614c3d /cache.h | |
| parent | describe: Refresh the index when run with --dirty (diff) | |
| parent | t3005: do not assume a particular order of stdout and stderr of git-ls-files (diff) | |
| download | tgif-a0b1cb60ab296476084b3d4766a943e2d62719b8.tar.xz | |
Merge branch 'cb/maint-ls-files-error-report' into maint
* cb/maint-ls-files-error-report:
t3005: do not assume a particular order of stdout and stderr of git-ls-files
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
@@ -1189,7 +1189,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); |