| commit | 1016658de3fe213eedebdb478cca0324ac8fbe87 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Apr 2015 21:37:13 +0000 (23 14:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Apr 2015 20:17:52 +0000 (29 13:17 -0700) | ||
| tree | 7f90a29f3f77684906fdbf81f26bfdd0a6cca41a | treesnapshot (tar.gz zip) |
| parent | eaa4e59c8545f61c6e61559df33dc4792e455d5a | commitdiff |
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>
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>
| builtin/merge.c | diffblobblamehistory |