All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Robert Dailey <rcdailey.lists@gmail.com>
Cc: Heiko Voigt <hvoigt@hvoigt.net>, Git <git@vger.kernel.org>
Subject: Re: Diffing submodule does not yield complete logs for merge commits
Date: Mon, 04 May 2015 14:03:31 -0700	[thread overview]
Message-ID: <xmqqegmwrr6k.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAHd499B=EcgYiTMFt9VYhj45bRkP8h9TBk1B0cr8fYFuXNe_mQ@mail.gmail.com> (Robert Dailey's message of "Mon, 4 May 2015 10:05:22 -0500")

Robert Dailey <rcdailey.lists@gmail.com> writes:

> For #1, do you recommend adding a 3rd setting for `diff.submodule`
> config? Something like "full-log" or something? Or an entirely new
> config? I noticed that in diff.h, the DIFF_OPT flags already consume
> 31 bits. If this is a 32-bit flag, there is only 1 bit left. If we go
> with a 3rd setting for `diff.submodule` I think this might consume the
> last bit.

Unless you are using opts->touched_flags infrastructure to do funky
defaulting dance, there is really nothing that forces you to use a
bit from the flag word for your new feature.  diff_options have many
standalone int fields that are used for either boolean or a small
enum (e.g. degraded_cc_to_c) and it is perfectly fine to use a new
such field.

      parent reply	other threads:[~2015-05-04 21:03 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-29 20:53 Diffing submodule does not yield complete logs for merge commits Robert Dailey
2015-05-01 17:57 ` Heiko Voigt
2015-05-04 15:05   ` Robert Dailey
2015-05-04 19:32     ` Jens Lehmann
2015-05-04 20:21       ` Robert Dailey
2015-05-04 20:51         ` Heiko Voigt
2015-05-05  5:49         ` Johannes Schindelin
2015-05-15 20:33           ` Robert Dailey
2015-05-18 12:30             ` Heiko Voigt
2015-05-18 15:06               ` Robert Dailey
2015-05-19 10:44                 ` Heiko Voigt
2015-05-19 19:29                   ` Robert Dailey
2015-05-19 20:34                     ` Stefan Beller
2015-05-22  9:17                       ` Roberto Tyley
2015-05-21 12:51                     ` Heiko Voigt
2015-05-30  2:18                       ` Robert Dailey
2015-05-30 10:41                         ` Heiko Voigt
2015-05-30 17:04                         ` Junio C Hamano
2015-05-30 19:19                           ` Robert Dailey
2015-05-30 19:37                             ` Robert Dailey
2015-05-30 19:54                             ` Junio C Hamano
2015-05-30 20:25                               ` Robert Dailey
2015-06-02 12:02                                 ` Heiko Voigt
2015-05-04 21:03     ` Junio C Hamano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqegmwrr6k.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=hvoigt@hvoigt.net \
    --cc=rcdailey.lists@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.