git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Thomas Gummerer <t.gummerer@gmail.com>, Elijah Newren <newren@gmail.com>
Subject: non-regression bug in 'git merge' (really, xdiff/xmerge, I think)
Date: Mon, 02 Mar 2020 14:21:18 -0800	[thread overview]
Message-ID: <xmqqy2si9z4x.fsf_-_@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20200302181924.GB1571684@cat> (Thomas Gummerer's message of "Mon, 2 Mar 2020 18:19:24 +0000")

Thomas Gummerer <t.gummerer@gmail.com> writes:

> diff --git a/Makefile b/Makefile
> index 9804a0758b..096c6d1fbb 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -609,7 +609,6 @@ SCRIPT_SH += git-merge-one-file.sh
>  SCRIPT_SH += git-merge-resolve.sh
>  SCRIPT_SH += git-mergetool.sh
>  SCRIPT_SH += git-quiltimport.sh
> -SCRIPT_SH += git-legacy-stash.sh
>  SCRIPT_SH += git-request-pull.sh
>  SCRIPT_SH += git-submodule.sh
>  SCRIPT_SH += git-web--browse.sh

Merging this topic to 'pu', which has dl/merge-autostash topic
already merged, breaks the build and it is not fault of Thomas's
topic.  dl/merge-autostash has the following bit:

commit 4b981afaa03c00524f1d4986271a3f4cc119f4cd
Merge: 06928448f7 de4db86ff2
Author: Junio C Hamano <gitster@pobox.com>
Date:   Mon Mar 2 13:23:26 2020 -0800

    Merge branch 'dl/merge-autostash' into pu
    
    "git merge" learns the "--autostash" option.
    
    * dl/merge-autostash:
      ...
      Makefile: alphabetically sort += lists

diff --git a/Makefile b/Makefile
index a5961113d8..c0793ac75b 100644
--- a/Makefile
+++ b/Makefile
@@ -604,12 +604,12 @@ unexport CDPATH
 SCRIPT_SH += git-bisect.sh
 SCRIPT_SH += git-difftool--helper.sh
 SCRIPT_SH += git-filter-branch.sh
+SCRIPT_SH += git-legacy-stash.sh
 SCRIPT_SH += git-merge-octopus.sh
 SCRIPT_SH += git-merge-one-file.sh
 SCRIPT_SH += git-merge-resolve.sh
 SCRIPT_SH += git-mergetool.sh
 SCRIPT_SH += git-quiltimport.sh
-SCRIPT_SH += git-legacy-stash.sh
 SCRIPT_SH += git-request-pull.sh
 SCRIPT_SH += git-submodule.sh
 SCRIPT_SH += git-web--browse.sh
@@ -617,8 +617,8 @@ SCRIPT_SH += git-web--browse.sh

which makes it appear to the xmerge code that legacy-status that
used to exist in between quiltimport and request-pull has already
been removed.

As Thomas's above patch exactly wants to do that (i.e. we want to
remove legacy-stash between quiltimport and request-pull), the
xmerge code seems to think incorrectly that the requested change has
already been applied.  And as a result of that, there remains
legacy-stash between fliter-branch and merge-octopus, breaking the
build by having one unbuildable build target X-<.




  parent reply	other threads:[~2020-03-02 22:21 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-24  8:33 Git Rebase: test failing with GIT_TEST_STASH_USE_BUILTIN=false Son Luong Ngoc
2020-02-25 16:57 ` Junio C Hamano
     [not found]   ` <710DB9BA-D134-48E7-8CAB-B8816FED8AB8@booking.com>
2020-03-01  9:59     ` [External] " Son Luong Ngoc
2020-03-01 10:40       ` Son Luong Ngoc
2020-03-02 18:18   ` [PATCH 1/2] stash: get git_stash_config at the top level Thomas Gummerer
2020-03-02 18:19     ` [PATCH 2/2] stash: remove the stash.useBuiltin setting Thomas Gummerer
2020-03-02 21:30       ` Junio C Hamano
2020-03-02 22:21       ` Junio C Hamano [this message]
2020-03-06 15:48         ` non-regression bug in 'git merge' (really, xdiff/xmerge, I think) Elijah Newren
2020-03-03 13:33       ` [PATCH 2/2] stash: remove the stash.useBuiltin setting Johannes Schindelin
2020-03-03 16:47         ` Junio C Hamano
2020-03-03 17:36         ` Thomas Gummerer
2020-03-04 16:41           ` Johannes Schindelin
     [not found]       ` <CA+P7+xqVyMnG6FiyL4hngPfEEMi5CKz1qN5Cy1TMMpLg3CmsBw@mail.gmail.com>
2020-03-06 14:11         ` Johannes Schindelin
2020-03-06 17:29         ` Thomas Gummerer
2020-03-03 17:46     ` [PATCH v2 1/2] stash: get git_stash_config at the top level Thomas Gummerer
2020-03-03 17:46       ` [PATCH v2 2/2] stash: remove the stash.useBuiltin setting Thomas Gummerer
2020-03-03 18:45         ` Junio C Hamano
2020-03-04 11:49           ` Thomas Gummerer
2020-03-04 16:25             ` Junio C Hamano
2020-03-05 17:04               ` Thomas Gummerer

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=xmqqy2si9z4x.fsf_-_@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=newren@gmail.com \
    --cc=t.gummerer@gmail.com \
    --subject='Re: non-regression bug in '\''git merge'\'' (really, xdiff/xmerge, I think)' \
    /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

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 NNTP newsgroup(s).