From: Junio C Hamano <email@example.com> To: Elijah Newren <firstname.lastname@example.org> Cc: Elijah Newren via GitGitGadget <email@example.com>, Git Mailing List <firstname.lastname@example.org> Subject: Re: [PATCH 2/4] t6038: fix test with obviously incorrect expectations Date: Mon, 03 Aug 2020 08:50:45 -0700 Message-ID: <email@example.com> (raw) In-Reply-To: <CABPp-BHNebxZK1-tXx0HMmPDuRoj=_XWG=pVJ2HCvTkttvA4oQ@mail.gmail.com> (Elijah Newren's message of "Mon, 3 Aug 2020 08:36:28 -0700") Elijah Newren <firstname.lastname@example.org> writes: >> I'd say that it is probably more intuitive to expect whatever >> attributes set on the currently checked out and receiving the >> cherry-picked change would take effect, but I do agree with you that >> this is not well defined. > ... > What if you don't have any version checked out, and are doing a merge > in a bare-repo or are just redoing a merge (on some other branch) > without touching the working directory or index just so you can view > that other merge? The "receiving" is the keyword in my "I'd say". Whey you view the result of merge, the merge may be symmetric, but when initiating a merge, you have a clear distinction between the target and other: I am merging these other side branches into this one. But as I said, I think it is not well defined whose attribute should be used. Some might even dream that .gitattributes from the tips being merged are somehow magically merged first and then the other paths' merges should use that resulting merged .gitattributes. > Also, what if you were doing a merge in a dirty working tree, where > your .gitattributes was locally modified? Should the local > .gitattributes file override the .gitattributes file recorded in > history for how those versions are merged (which seems somewhat > suggested by your answer)? Yes, that is quite deliberate outcome from "when doing a merge, the person who is merging is fully aware into which branch others are merged into".
next prev parent reply index Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-08-02 6:33 [PATCH 0/4] Attr fixes Elijah Newren via GitGitGadget 2020-08-02 6:33 ` [PATCH 1/4] t6038: make tests fail for the right reason Elijah Newren via GitGitGadget 2020-08-02 18:17 ` Junio C Hamano 2020-08-02 19:10 ` Eric Sunshine 2020-08-03 15:06 ` Elijah Newren 2020-08-02 6:33 ` [PATCH 2/4] t6038: fix test with obviously incorrect expectations Elijah Newren via GitGitGadget 2020-08-02 19:57 ` Junio C Hamano 2020-08-03 15:36 ` Elijah Newren 2020-08-03 15:50 ` Junio C Hamano [this message] 2020-08-02 6:33 ` [PATCH 3/4] merge: make merge.renormalize work for all uses of merge machinery Elijah Newren via GitGitGadget 2020-08-02 19:23 ` Junio C Hamano 2020-08-03 15:07 ` Elijah Newren 2020-08-02 6:33 ` [PATCH 4/4] checkout: support renormalization with checkout -m <paths> Elijah Newren via GitGitGadget 2020-08-03 18:41 ` [PATCH v2 0/4] Attr fixes Elijah Newren via GitGitGadget 2020-08-03 18:41 ` [PATCH v2 1/4] t6038: make tests fail for the right reason Elijah Newren via GitGitGadget 2020-08-03 18:41 ` [PATCH v2 2/4] t6038: remove problematic test Elijah Newren via GitGitGadget 2020-08-03 18:41 ` [PATCH v2 3/4] merge: make merge.renormalize work for all uses of merge machinery Elijah Newren via GitGitGadget 2020-08-03 18:41 ` [PATCH v2 4/4] checkout: support renormalization with checkout -m <paths> Elijah Newren via GitGitGadget
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 \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.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
Git Mailing List Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/git/0 git/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 git git/ https://lore.kernel.org/git \ firstname.lastname@example.org public-inbox-index git Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git