summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-30 20:19:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-30 20:19:21 -0700
commitd98a20114d641789e1c886f6c26e63d91132f5da (patch)
treeecedf83d9a56ff47e1a44030faa705aa90078ed4
parentMerge branch 'jk/maint-config-alias-fix' (diff)
parentuserformat_find_requirements(): find requirement for the correct format (diff)
downloadtgif-d98a20114d641789e1c886f6c26e63d91132f5da.tar.xz
Merge branch 'jc/fmt-req-fix'
* jc/fmt-req-fix: userformat_find_requirements(): find requirement for the correct format
-rw-r--r--pretty.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pretty.c b/pretty.c
index dff5c8d183..52174fd147 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1084,7 +1084,7 @@ void userformat_find_requirements(const char *fmt, struct userformat_want *w)
return;
fmt = user_format;
}
- strbuf_expand(&dummy, user_format, userformat_want_item, w);
+ strbuf_expand(&dummy, fmt, userformat_want_item, w);
strbuf_release(&dummy);
}