Message ID | 59df085d-0de8-45b1-9b8b-c69e91e56a1f@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 92e66478fc0f1e03ff8e49d66ebe84b1d98b7a90 |
Headers | show |
Series | tag: error when git-column fails | expand |
Rubén Justo <rjusto@gmail.com> writes: > @@ -530,7 +530,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix) > struct column_options copts; > memset(&copts, 0, sizeof(copts)); > copts.padding = 2; > - run_column_filter(colopts, &copts); > + if (run_column_filter(colopts, &copts)) > + die(_("could not start 'git column'")); Nice. This obvious omission should have been here from the day one. Will queue. Thanks. > } > filter.name_patterns = argv; > ret = list_tags(&filter, sorting, &format);
diff --git a/builtin/tag.c b/builtin/tag.c index 37473ac21f..19a7e06bf4 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -530,7 +530,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix) struct column_options copts; memset(&copts, 0, sizeof(copts)); copts.padding = 2; - run_column_filter(colopts, &copts); + if (run_column_filter(colopts, &copts)) + die(_("could not start 'git column'")); } filter.name_patterns = argv; ret = list_tags(&filter, sorting, &format);
If the user asks for the list of tags to be displayed in columns ("--columns"), a child git-column process is used to format the output as expected. In a rare situation where we encounter a problem spawning that child process, we will work erroneously. Make noticeable we're having a problem executing git-column, so the user can act accordingly. Signed-off-by: Rubén Justo <rjusto@gmail.com> --- builtin/tag.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)