From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> To: git@vger.kernel.org Cc: Elijah Newren <newren@gmail.com> Subject: [PATCH 0/4] Attr fixes Date: Sun, 02 Aug 2020 06:33:02 +0000 Message-ID: <pull.825.git.git.1596349986.gitgitgadget@gmail.com> (raw) This fixes a few issues surrounding .gitattributes files and usage of the merge machinery outside of "git merge". All were issues I found and fixed while working on merge-ort. Patches 1, 3, and 4 are definitely fixes. Patch 2 only touches a testcase and might be a fix, or might just change it to a different kind of brokenness -- either way, it leaves the affected testcase as test_expect_failure. I'm kind of curious what is correct expected behavior for that and similar testcases. I probably won't implement it, and I'm worried it might be rife with multi-layered corner cases and no good way to define correct behavior for all cases. Elijah Newren (4): t6038: make tests fail for the right reason t6038: fix test with obviously incorrect expectations merge: make merge.renormalize work for all uses of merge machinery checkout: support renormalization with checkout -m <paths> builtin/checkout.c | 18 ++++++------------ builtin/merge.c | 7 +++---- merge-recursive.c | 3 +++ t/t6038-merge-text-auto.sh | 20 ++++++++++---------- 4 files changed, 22 insertions(+), 26 deletions(-) base-commit: 47ae905ffb98cc4d4fd90083da6bc8dab55d9ecc Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-825%2Fnewren%2Fattr-fixes-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-825/newren/attr-fixes-v1 Pull-Request: https://github.com/git/git/pull/825 -- gitgitgadget
next reply other threads:[~2020-08-02 6:33 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-08-02 6:33 Elijah Newren via GitGitGadget [this message] 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 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 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=pull.825.git.git.1596349986.gitgitgadget@gmail.com \ --to=gitgitgadget@gmail.com \ --cc=git@vger.kernel.org \ --cc=newren@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
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror http://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ http://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git