Re: [PATCH 66/67] use strbuf_complete to conditionally append slash
flat view
From: Jeff King <hidden>
Date: 2016-06-15 23:06:38
On Sun, Sep 20, 2015 at 09:50:28PM -0400, Eric Sunshine wrote:
quoted
diff --git a/builtin/clean.c b/builtin/clean.c index df53def..d7acb94 100644 --- a/builtin/clean.c +++ b/builtin/clean.c@@ -159,8 +159,7 @@ static int is_git_repository(struct strbuf *path) int gitfile_error; size_t orig_path_len = path->len; assert(orig_path_len != 0); - if (path->buf[orig_path_len - 1] != '/') - strbuf_addch(path, '/'); + strbuf_complete(path, '/');Does the above assert() still have value following this change? I recall, when reviewing this code, specifically asking[1,2] for an assert() or some other check to show that accessing buf[orig_path_len - 1] was safe. Since this patch removes the code in question, the assert() may no longer have meaning. [1]: http://thread.gmane.org/gmane.comp.version-control.git/266839/focus=266892 [2]: http://thread.gmane.org/gmane.comp.version-control.git/266839/focus=266974
I didn't dig that far, as I was mostly aiming for an obvious no-behavior-change transition to the new helper, and dropping the assert means we will behave differently overall for an empty path. I agree from the messages you quote that it is probably fine, but I wonder if it should be in a separate patch. -Peff