On Mon, Apr 24, 2017 at 10:20:27AM -0700, Stefan Beller wrote:
> On Sun, Apr 23, 2017 at 2:34 PM, brian m. carlson
> <sandals@xxxxxxxxxxxxxxxxxxxx> wrote:
> > Signed-off-by: brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx>
> > ---
>
> > @@ -2823,12 +2821,10 @@ static void parse_new_commit(const char *arg)
> > strbuf_addf(&new_data, "tree %s\n",
> > oid_to_hex(&b->branch_tree.versions[1].oid));
> > if (!is_null_oid(&b->oid))
> > - strbuf_addf(&new_data, "parent %s\n",
> > - oid_to_hex(&b->oid));
> > + strbuf_addf(&new_data, "parent %s\n", oid_to_hex(&b->oid));
> > while (merge_list) {
> > struct hash_list *next = merge_list->next;
> > - strbuf_addf(&new_data, "parent %s\n",
> > - oid_to_hex(&merge_list->oid));
> > + strbuf_addf(&new_data, "parent %s\n", oid_to_hex(&merge_list->oid));
> > free(merge_list);
> > merge_list = next;
> > }
>
> This is a funny one. The only change is line rewrapping, as it fits
> into 80 cols easily.
> I was reviewing this series using colored --word-diff output, and this hunk does
> not produce any red or green. I wonder if this is the intended
> behavior of the word diffing
> or if we rather want to insert a <RED> - \n - </RED>.
I used Coccinelle for part of this, I think, so that would be why.
Sometimes it doesn't do everything I want, but it lets me do less manual
work. I'll revert that change in the reroll.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: https://keybase.io/bk2204
Attachment:
signature.asc
Description: PGP signature