Johannes Sixt <j.sixt@xxxxxxxxxxxxx> writes:
> Junio C Hamano schrieb:
>> <<<<<<< HEAD:foo
>> これはサイドブランチの変更です。
>> やはり JIS コードで書いてます。
>> =======
>> 日本語のファイルです。
>> JIS コードで書いてます。
>>>>>>>>> master:foo
>>
>> The above will probably come out as UTF-8 in this mail text, but the point
>> is that the confict side markers do not have anything but filename and the
>> branch name. I am still scratching my head trying to see where in the
>> merge-recursive codepath you got snippet of log message.
>
> Try rebase -i instead of merge: This should put summary lines onto the
> conflict markers.
Ah, that's cherry-pick.
The fix should be around the area this weather-balloon patch touches.
Note that this does not correctly work yet, and it seems that somewhere the
string is truncated.
But I won't be debugging it further for now...
----
builtin-revert.c | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git c/builtin-revert.c w/builtin-revert.c
index d48313c..47ff16f 100644
--- c/builtin-revert.c
+++ w/builtin-revert.c
@@ -244,6 +244,19 @@ static struct tree *empty_tree(void)
return tree;
}
+static char *branch_label_to_output_encoding(char *oneline)
+{
+ if (git_log_output_encoding &&
+ strcmp(git_log_output_encoding, git_commit_encoding)) {
+ char *it = reencode_string(oneline,
+ git_log_output_encoding,
+ git_commit_encoding);
+ if (it)
+ return it;
+ }
+ return oneline;
+}
+
static int revert_or_cherry_pick(int argc, const char **argv)
{
unsigned char head[20];
@@ -373,7 +386,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
read_cache();
init_merge_options(&o);
o.branch1 = "HEAD";
- o.branch2 = oneline;
+ o.branch2 = branch_label_to_output_encoding(oneline);
head_tree = parse_tree_indirect(head);
next_tree = next ? next->tree : empty_tree();
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
