From: Elijah Newren <newren@gmail.com>
To: Leif Middelschulte <leif.middelschulte@gmail.com>
Cc: Stefan Beller <sbeller@google.com>,
Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 1/1] Inform about fast-forwarding of submodules during merge
Date: Fri, 18 May 2018 14:25:26 -0700 [thread overview]
Message-ID: <CABPp-BGGe3r_QiC5264xkj0cp2Vu6WoLQZeDGEJi4eOpUW9z3g@mail.gmail.com> (raw)
In-Reply-To: <20180518194802.28355-2-leif.middelschulte@gmail.com>
Hi Leif,
On Fri, May 18, 2018 at 12:48 PM, Leif Middelschulte
<leif.middelschulte@gmail.com> wrote:
> From: Leif Middelschulte <Leif.Middelschulte@gmail.com>
>
> Silent fast-forwarding might lead to inconveniences in cases where
> submodules are expected to have a certain revision, because 'more recent'
> (therefore fast-forwardable) versions might break behavior/contain regressions.
>
> A use-case is the integration (merge) phase as part of the feature-centric
> 'git-flow' workflow [0]. I.e. a feature might be well-tested with a certain
> submodule revision, but break because of regressions (or changes in general)
> within an updated version of the sourced submodule.
>
> This change tries to support the integrator by telling her about another possible
> source of unexpected behavior (differing submodule versions) she might see
> during integration tests.
Thanks for continuing to push on this. This looks good so far (to
me), but I was also hoping to see the analogy between these messages
and "Auto-merging $FILE" for regular files mentioned. Both Junio[1]
and I[2] pointed out this similarity, and I think this
similarity/analogy is useful additional motivation for making this
change.
[1] https://public-inbox.org/git/xmqqo9hg7554.fsf@gitster-ct.c.googlers.com/
[2] https://public-inbox.org/git/CABPp-BGaibCPWuCnaX5Af=sv-2zvyhNcupT+-PkxHDfJBg_Vbw@mail.gmail.com/
> + } else if (show(o, 2))
> + output(o, 2, _("Fast-forwarding submodule %s to %s"), path, oid_to_hex(b));
...
> + } else if (show(o, 2))
> + output(o, 2, _("Fast-forwarding submodule %s to %s"), path, oid_to_hex(a));
Also, by analogy to the "Auto-merging $FILE" comparison, the "to %s"
on these two lines feels out of place. Users can just look at the
submodule to see what it was updated to. In a sea of output from
merging, this extra detail feels like noise for the standard use-case,
unless I'm misunderstanding how submodules are special. Junio also
commented on this in the same email referenced above (at [1]). Is
there a reason this is an important piece of the message for you to be
shown at the standard merge verbosity?
next prev parent reply other threads:[~2018-05-18 21:25 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-17 6:01 What's cooking in git.git (May 2018, #02; Thu, 17) Junio C Hamano
2018-05-17 6:39 ` jk/branch-l-0-deprecation (was Re: What's cooking in git.git (May 2018, #02; Thu, 17)) Kaartic Sivaraam
2018-05-17 9:48 ` Ævar Arnfjörð Bjarmason
2018-05-17 11:00 ` Kaartic Sivaraam
2018-05-17 12:02 ` Ævar Arnfjörð Bjarmason
2018-05-17 13:36 ` Jeff King
2018-05-24 15:10 ` Kaartic Sivaraam
2018-05-24 19:22 ` Jeff King
2018-05-24 19:31 ` [PATCH] branch: issue "-l" deprecation warning after pager starts Jeff King
2018-05-25 1:55 ` Junio C Hamano
2018-05-25 2:40 ` Jeff King
2018-05-25 8:56 ` Junio C Hamano
2018-05-25 9:14 ` Junio C Hamano
2018-05-25 17:10 ` Jeff King
2018-05-26 2:37 ` Junio C Hamano
2018-05-25 21:00 ` [RFC PATCH 0/3] usage: prefix all lines in `vreportf()`, not just the first Martin Ågren
2018-05-25 21:00 ` [RFC PATCH 1/3] usage: extract `prefix_suffix_lines()` from `advise()` Martin Ågren
2018-05-28 8:27 ` Junio C Hamano
2018-05-28 18:40 ` Duy Nguyen
2018-05-29 21:33 ` Jeff King
2018-05-29 21:39 ` Jeff King
2018-05-30 1:42 ` Junio C Hamano
2018-05-30 6:00 ` Junio C Hamano
2018-05-30 10:26 ` Martin Ågren
2018-05-31 6:07 ` Jeff King
2018-05-25 21:00 ` [RFC PATCH 2/3] usage: prefix all lines in `vreportf()`, not just the first Martin Ågren
2018-05-28 9:25 ` Junio C Hamano
2018-05-28 18:45 ` Duy Nguyen
2018-05-28 21:45 ` Junio C Hamano
2018-05-29 4:49 ` Martin Ågren
2018-05-29 5:50 ` Junio C Hamano
2018-05-29 10:30 ` Martin Ågren
2018-05-29 12:08 ` Junio C Hamano
2018-05-29 15:50 ` Duy Nguyen
2018-05-30 10:19 ` Martin Ågren
2018-05-29 21:32 ` Jeff King
2018-05-30 10:20 ` Martin Ågren
2018-05-25 21:00 ` [RFC PATCH 3/3] usage: translate the "error: "-prefix and others Martin Ågren
2018-05-26 2:32 ` [PATCH] branch: issue "-l" deprecation warning after pager starts Junio C Hamano
2018-05-26 2:33 ` Junio C Hamano
2018-05-29 21:20 ` Jeff King
2018-05-29 21:21 ` Jeff King
2018-05-30 2:48 ` Junio C Hamano
2018-05-31 5:44 ` Jeff King
2018-05-26 19:39 ` Kaartic Sivaraam
2018-06-02 4:46 ` Duy Nguyen
2018-06-02 8:10 ` Jeff King
2018-05-26 18:45 ` Kaartic Sivaraam
2018-05-29 21:15 ` Jeff King
2018-05-30 2:52 ` Junio C Hamano
2018-05-31 5:51 ` Jeff King
2018-06-01 1:35 ` Junio C Hamano
2018-05-31 5:52 ` Kaartic.Sivaraam
2018-05-17 13:22 ` What's cooking in git.git (May 2018, #02; Thu, 17) Derrick Stolee
2018-05-17 18:20 ` Stefan Beller
2018-05-17 18:29 ` [PATCH 0/2] Reroll 2 last commits of sb/object-store-replace Stefan Beller
2018-05-17 18:29 ` [PATCH 1/2] object.c: free replace map in raw_object_store_clear Stefan Beller
2018-05-17 18:29 ` [PATCH 2/2] replace-object.c: remove the_repository from prepare_replace_object Stefan Beller
2018-05-17 18:40 ` [PATCH] merge-recursive: give notice when submodule commit gets fast-forwarded Stefan Beller
2018-05-18 19:43 ` [PATCH v2 0/1] rebased: inform about auto submodule ff Leif Middelschulte
2018-05-18 19:48 ` [PATCH v3 " Leif Middelschulte
2018-05-18 19:48 ` [PATCH 1/1] Inform about fast-forwarding of submodules during merge Leif Middelschulte
2018-05-18 21:25 ` Elijah Newren [this message]
2018-05-21 4:12 ` Junio C Hamano
2018-05-17 19:46 ` [PATCH 0/8] Reroll of sb/diff-color-move-more Stefan Beller
2018-05-17 19:46 ` [PATCH 1/8] xdiff/xdiff.h: remove unused flags Stefan Beller
2018-05-17 19:46 ` [PATCH 2/8] xdiff/xdiffi.c: remove unneeded function declarations Stefan Beller
2018-05-17 19:46 ` [PATCH 3/8] diff.c: do not pass diff options as keydata to hashmap Stefan Beller
2018-05-17 19:46 ` [PATCH 4/8] diff.c: adjust hash function signature to match hashmap expectation Stefan Beller
2018-05-17 19:46 ` [PATCH 5/8] diff.c: add a blocks mode for moved code detection Stefan Beller
2018-05-17 19:46 ` [PATCH 6/8] diff.c: decouple white space treatment from move detection algorithm Stefan Beller
2018-05-18 4:00 ` Simon Ruderich
2018-05-18 19:25 ` Stefan Beller
2018-05-17 19:46 ` [PATCH 7/8] diff.c: add --color-moved-ignore-space-delta option Stefan Beller
2018-05-17 19:46 ` [PATCH 8/8] diff: color-moved white space handling options imply color-moved Stefan Beller
2018-05-17 22:53 ` [PATCH 0/8] Reroll of sb/diff-color-move-more Jonathan Tan
2018-06-07 23:54 ` Jacob Keller
2018-05-17 22:36 ` What's cooking in git.git (May 2018, #02; Thu, 17) Junio C Hamano
2018-05-17 22:39 ` Stefan Beller
2018-05-17 22:56 ` Junio C Hamano
2018-05-17 22:58 ` Stefan Beller
2018-05-21 1:57 ` brian m. carlson
2018-05-21 17:36 ` Stefan Beller
2018-05-25 12:28 ` sb/submodule-move-nested breaks t7411 under GIT_FSMONITOR_TEST Ævar Arnfjörð Bjarmason
2018-05-25 17:27 ` Stefan Beller
2018-05-25 19:49 ` Stefan Beller
2018-09-06 12:31 ` Ævar Arnfjörð Bjarmason
2018-09-06 16:57 ` Stefan Beller
2018-09-06 19:03 ` Ben Peart
2018-09-06 20:14 ` Stefan Beller
2018-09-06 20:34 ` [PATCH] git-mv: allow submodules and fsmonitor to work together Stefan Beller
2018-09-10 15:58 ` Ben Peart
2018-09-10 16:29 ` [PATCH v1] " Ben Peart
2018-09-10 17:07 ` Stefan Beller
2018-09-10 19:38 ` Ben Peart
-- strict thread matches above, loose matches on Subject: below --
2018-05-11 1:00 [PATCH 0/2] Submodule merging: i18n, verbosity Stefan Beller
2018-05-14 20:57 ` [PATCH 0/1] rebased: inform about auto submodule ff during merge Leif Middelschulte
2018-05-14 20:57 ` [PATCH 1/1] Inform about fast-forwarding of submodules " Leif Middelschulte
2018-05-15 0:41 ` Stefan Beller
2018-05-15 1:17 ` Elijah Newren
2018-05-15 7:34 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CABPp-BGGe3r_QiC5264xkj0cp2Vu6WoLQZeDGEJi4eOpUW9z3g@mail.gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=leif.middelschulte@gmail.com \
--cc=sbeller@google.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).