| commit | 018b3fbc7e66439786492662b88cb34d7d000621 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 25 Apr 2015 19:31:57 +0000 (25 12:31 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Apr 2015 20:19:21 +0000 (29 13:19 -0700) | ||
| tree | f9bf4575cc4295f2ec35a49f905a6731e33bb605 | treesnapshot (tar.gz zip) |
| parent | 34349dbff8632c353f083959881e38e1c853abf8 | commitdiff |
merge: narrow scope of merge_names
In order to pass the list of parents to fmt_merge_msg(), cmd_merge()
uses this strbuf to create something that look like FETCH_HEAD that
describes commits that are being merged. This is necessary only
when we are creating the merge commit message ourselves, but was
done unconditionally.
Move the variable and the logic to populate it to confine them in a
block that needs them.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
In order to pass the list of parents to fmt_merge_msg(), cmd_merge()
uses this strbuf to create something that look like FETCH_HEAD that
describes commits that are being merged. This is necessary only
when we are creating the merge commit message ourselves, but was
done unconditionally.
Move the variable and the logic to populate it to confine them in a
block that needs them.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge.c | diffblobblamehistory |