X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/19c3ac60ede476130e693ece1752a29fa4e13512..a300856947a0f87669b7133b923cc0153444edfe:/tig.c diff --git a/tig.c b/tig.c index 8d5f656..16139c4 100644 --- a/tig.c +++ b/tig.c @@ -1874,7 +1874,7 @@ update_view(struct view *view) size_t ret; - ret = iconv(opt_iconv, (const char **) &inbuf, &inlen, &outbuf, &outlen); + ret = iconv(opt_iconv, &inbuf, &inlen, &outbuf, &outlen); if (ret != (size_t) -1) { line = out_buffer; linelen = strlen(out_buffer); @@ -2311,7 +2311,7 @@ add_describe_ref(char *buf, size_t *bufpos, char *commit_id, const char *sep) char *ref = NULL; FILE *pipe; - if (!string_format(refbuf, "git describe %s", commit_id)) + if (!string_format(refbuf, "git describe %s 2>/dev/null", commit_id)) return TRUE; pipe = popen(refbuf, "r");