[PATCH v9 14/20] ref-filter: Do not abruptly die when using the 'lstrip=<N>' option
- From
Karthik Nayak <karthik.188@gmail.com>
- Date
- Dec 27, 2016, 16:23 UTC
- Message-ID
- <20161227162357.28212-15-Karthik.188@gmail.com>
- In-Reply-To
- <20161227162357.28212-1-Karthik.188@gmail.com>
Currently when we use the 'lstrip=<N>' option, if 'N' is greater than the number of components available in the refname, we abruptly end program execution by calling die().
This behavior is undesired since a single refname with few components could end program execution. To avoid this, return an empty string whenever the value 'N' is greater than the number of components available, instead of calling die().
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com> --- Documentation/git-for-each-ref.txt | 3 +-- ref-filter.c | 3 +-- t/t6300-for-each-ref.sh | 4 ---- 3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt index 46b4583..82c202a 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@ -98,8 +98,7 @@ refname:: abbreviation mode. If `lstrip=<N>` is appended, strips `<N>` slash-separated path components from the front of the refname (e.g., `%(refname:lstrip=2)` turns `refs/tags/foo` into `foo`. - `<N>` must be a positive integer. If a displayed ref has fewer - components than `<N>`, the command aborts with an error. + `<N>` must be a positive integer. objecttype:: The type of the object (`blob`, `tree`, `commit`, `tag`). diff --git a/ref-filter.c b/ref-filter.c index e0015c6..76553eb 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1099,8 +1099,7 @@ static const char *lstrip_ref_components(const char *refname, unsigned int len) while (remaining) { switch (*start++) { case '\0': - die(_("ref '%s' does not have %ud components to :lstrip"), - refname, len); + return ""; case '/': remaining--; break; diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index 5eb013c..d3d1a97 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -147,10 +147,6 @@ test_expect_success 'arguments to :lstrip must be positive integers' ' test_must_fail git for-each-ref --format="%(refname:lstrip=foo)" ' -test_expect_success 'stripping refnames too far gives an error' ' - test_must_fail git for-each-ref --format="%(refname:lstrip=3)" -' - test_expect_success 'Check format specifiers are ignored in naming date atoms' ' git for-each-ref --format="%(authordate)" refs/heads && git for-each-ref --format="%(authordate:default) %(authordate)" refs/heads &&
-- 2.10.2