From: Edmundo Carmona Antoranz <eantoranz@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH v2] builtin/merge: allow --squash to commit if there are no conflicts
Date: Wed, 17 Jul 2019 18:41:36 -0600 [thread overview]
Message-ID: <CAOc6etYM6DSDQ_H=eJs1xuGU9a83kTe2-vEy9+FEgHobT77_Eg@mail.gmail.com> (raw)
In-Reply-To: <xmqq5zo01qnv.fsf@gitster-ct.c.googlers.com>
On Wed, Jul 17, 2019 at 12:07 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Sure. I started skimming and then gave up after seeing that quite a
> lot of code has been shuffled around without much explanation (e.g.
> printing of "Squash commit -- not updating HEAD" is gone from the
> callee and now it is a responsibility of the caller), making it
> harder than necessary to see if there is any unintended behaviour
> change when the new feature is not in use. Whatever you are trying,
> it does look like the change deserves to be split into a smaller
> pieces to become more manageable.
>
> Thanks.
>
yw!
I'm focusing on the squash --commit part only. I think I'm close to
getting the desired result and now I'm taking a close look at the unit
tests and a question came up on two tests of t7600-merge.sh:
merge c0 with c1 (squash)
merge c0 with c1 (squash, ff-only)
In both cases it's a FF (right?) so no new revision is created. The
unit tests are requiring that $GIT_DIR/squash_msg have some content:
not ok 20 - merge c0 with c1 (squash, ff-only)
#
# git reset --hard c0 &&
# git merge --squash --ff-only c1 &&
# verify_merge file result.1 &&
# verify_head $c0 &&
# verify_no_mergehead &&
# test_cmp squash.1 .git/SQUASH_MSG
not ok 18 - merge c0 with c1 (squash)
#
# git reset --hard c0 &&
# git merge --squash c1 &&
# verify_merge file result.1 &&
# verify_head $c0 &&
# verify_no_mergehead &&
# test_cmp squash.1 .git/SQUASH_MSG
Does it make sense to keep this file in those two situations?
next prev parent reply other threads:[~2019-07-18 0:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-13 5:18 [PATCH v2] builtin/merge: allow --squash to commit if there are no conflicts Edmundo Carmona Antoranz
2019-07-13 5:27 ` Edmundo Carmona Antoranz
2019-07-14 18:59 ` Junio C Hamano
2019-07-14 7:15 ` Edmundo Carmona Antoranz
2019-07-17 18:07 ` Junio C Hamano
2019-07-18 0:41 ` Edmundo Carmona Antoranz [this message]
2019-07-18 2:32 ` Edmundo Carmona Antoranz
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='CAOc6etYM6DSDQ_H=eJs1xuGU9a83kTe2-vEy9+FEgHobT77_Eg@mail.gmail.com' \
--to=eantoranz@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).