git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eaa4e59)
merge: small leakfix and code simplification
authorJunio C Hamano <redacted>
Thu, 23 Apr 2015 21:37:13 +0000 (14:37 -0700)
committerJunio C Hamano <redacted>
Wed, 29 Apr 2015 20:17:52 +0000 (13:17 -0700)
commit1016658de3fe213eedebdb478cca0324ac8fbe87
tree7f90a29f3f77684906fdbf81f26bfdd0a6cca41atree | snapshot
parenteaa4e59c8545f61c6e61559df33dc4792e455d5acommit | diff
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 <redacted>
builtin/merge.c diff | blob | history
git clone https://git.99rst.org/PROJECT