summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-04-23 14:37:13 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-04-29 13:17:52 -0700
commit1016658de3fe213eedebdb478cca0324ac8fbe87 (patch)
tree7f90a29f3f77684906fdbf81f26bfdd0a6cca41a /templates
parentmerge: do not check argc to determine number of remote heads (diff)
downloadtgif-1016658de3fe213eedebdb478cca0324ac8fbe87.tar.xz
merge: small leakfix and code simplification
When parsing a merged object name like "foo~20" to formulate a merge summary "Merge branch foo (early part)", a temporary strbuf is used, but we forgot to deallocate it when we failed to find the named branch. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions