Re: [PATCH v3 8/8] log --remerge-diff: show what the conflict resolution changed

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 9, 2014, 19:08 UTC
Message-ID: <xmqqr3zkk3x9.fsf@gitster.dls.corp.google.com>
In-Reply-To: <29c15efe998630143eaa75ec7155a31ce17bd433.1409860234.git.tr@thomasrast.ch>

Thomas Rast <tr@thomasrast.ch> writes:

Show 11 quoted lines

> +			assemble_conflict_entry(&content,
> +						branch1, branch2,
> +						stage2, stage3);
> +			if (write_sha1_file(content.buf, content.len,
> +					    typename(OBJ_BLOB), sha1))
> +				die("write_sha1_file failed");
> +...
> +	if (cache_tree_update(&the_index, WRITE_TREE_SILENT) < 0) {
> +		printf("BUG: merge conflicts not fully folded, cannot diff.\n");
> +		return !opt->loginfo;
> +	}

Another worry I have on this change is that it breaks the expectation that "log [-p]" is a read-only operation. I do not know how big a breakage this will be viewed as by those uninitiated who do not know how --remerge-diff (or Git in general) works internally.