From 7e7abea96b8140c592a46293f5e33aae0683c7ac Mon Sep 17 00:00:00 2001 From: Dmitry Potapov Date: Sat, 11 Oct 2008 20:39:37 +0400 Subject: [PATCH] print an error message for invalid path If verification of path failed, it is always better to print an error message saying this than relying on the caller function to print a meaningful error message (especially when the callee already prints error message for another situation). Because the callers of add_index_entry_with_check() did not print any error message, it resulted that the user would not notice the problem when checkout of an invalid path failed. Signed-off-by: Dmitry Potapov Signed-off-by: Shawn O. Pearce --- builtin-update-index.c | 2 +- read-cache.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/builtin-update-index.c b/builtin-update-index.c index 417f9724ab..3a2291b03e 100644 --- a/builtin-update-index.c +++ b/builtin-update-index.c @@ -218,7 +218,7 @@ static int add_cacheinfo(unsigned int mode, const unsigned char *sha1, struct cache_entry *ce; if (!verify_path(path)) - return -1; + return error("Invalid path '%s'", path); len = strlen(path); size = cache_entry_size(len); diff --git a/read-cache.c b/read-cache.c index d7900f33ea..6f344f345d 100644 --- a/read-cache.c +++ b/read-cache.c @@ -608,8 +608,10 @@ struct cache_entry *make_cache_entry(unsigned int mode, int size, len; struct cache_entry *ce; - if (!verify_path(path)) + if (!verify_path(path)) { + error("Invalid path '%s'", path); return NULL; + } len = strlen(path); size = cache_entry_size(len); @@ -893,7 +895,7 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e if (!ok_to_add) return -1; if (!verify_path(ce->name)) - return -1; + return error("Invalid path '%s'", ce->name); if (!skip_df_check && check_file_directory_conflict(istate, ce, pos, ok_to_replace)) { -- 2.11.4.GIT