[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/magit 8cee789f7a 10/28: magit-anything-staged-p: Extend co
From: |
Jonas Bernoulli |
Subject: |
[nongnu] elpa/magit 8cee789f7a 10/28: magit-anything-staged-p: Extend comment about Git v2.46.{0, 1} bugs |
Date: |
Fri, 6 Dec 2024 17:17:03 -0500 (EST) |
branch: elpa/magit
commit 8cee789f7a61a491d23a78360cbd2d626eda0f06
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>
magit-anything-staged-p: Extend comment about Git v2.46.{0,1} bugs
---
lisp/magit-git.el | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index ae71009f61..810bc8d575 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -1260,10 +1260,15 @@ Sorted from longest to shortest CYGWIN name."
"Return t if there are any staged changes.
If optional FILES is non-nil, then only changes to those files
are considered."
+ ;; The "--submodule=short" is needed to work around a bug in Git v2.46.0
+ ;; and v2.46.1. See #5212 and #5221. There are actually two related
+ ;; bugs, both of which are fixed in v2.46.2, with the following commits,
+ ;; but there is no workaround for the second bug.
+ ;; 11591850dd diff: report dirty submodules as changes in builtin_diff()
+ ;; 87cf96094a diff: report copies and renames as changes in run_diff_cmd()
(magit-git-failure "diff" "--quiet" "--cached"
(if ignore-submodules
"--ignore-submodules"
- ;; Work around a bug in Git v2.46.0. See #5212 and
#5221.
"--submodule=short")
"--" files))
- [nongnu] elpa/magit 15bf7dc53d 09/28: magit--insert-log: Ignore magit--git-wash-keep-error again, (continued)
- [nongnu] elpa/magit 15bf7dc53d 09/28: magit--insert-log: Ignore magit--git-wash-keep-error again, Jonas Bernoulli, 2024/12/06
- [nongnu] elpa/magit 1f17e515cf 06/28: magit--git-{insert, wash}: Potentially use complete error text, Jonas Bernoulli, 2024/12/06
- [nongnu] elpa/magit 230b91d819 04/28: magit--insert-{diff, log}: Respect magit--git-wash-keep-error, Jonas Bernoulli, 2024/12/06
- [nongnu] elpa/magit b2b07b993e 02/28: Silence checkdoc, Jonas Bernoulli, 2024/12/06
- [nongnu] elpa/magit e254dda362 07/28: magit-diff-highlight-list: Fix case when showing an error, Jonas Bernoulli, 2024/12/06
- [nongnu] elpa/magit 76253bda0d 08/28: magit--git-wash-keep-error: Enable by default, Jonas Bernoulli, 2024/12/06
- [nongnu] elpa/magit 8a6ca692fe 14/28: magit-process-password-prompt-regexps: Add another user@host lookup, Jonas Bernoulli, 2024/12/06
- [nongnu] elpa/magit 7adad8c8d3 28/28: Release version 4.1.3, Jonas Bernoulli, 2024/12/06
- [nongnu] elpa/magit cea06e4d4e 27/28: Bump dependencies, Jonas Bernoulli, 2024/12/06
- [nongnu] elpa/magit e52dedf07f 22/28: magit-stash-{pop, apply}: Stop after successfully installing conflict, Jonas Bernoulli, 2024/12/06
- [nongnu] elpa/magit 8cee789f7a 10/28: magit-anything-staged-p: Extend comment about Git v2.46.{0, 1} bugs,
Jonas Bernoulli <=
- [nongnu] elpa/magit 70aa9eeee0 20/28: Update changelog, Jonas Bernoulli, 2024/12/06
- [nongnu] elpa/magit a98ebd273f 13/28: magit-process-password-auth-source: Trim docstring, Jonas Bernoulli, 2024/12/06
- [nongnu] elpa/magit 46824fb4c1 24/28: Fix typos in changelog, Jonas Bernoulli, 2024/12/06
- [nongnu] elpa/magit 089f130f73 11/28: ci: Generate statistics weekly, Jonas Bernoulli, 2024/12/06
- [nongnu] elpa/magit fed387282a 12/28: magit-submodule-populate: Support --recursive, Jonas Bernoulli, 2024/12/06
- [nongnu] elpa/magit 3deaad3d29 16/28: Use mapcan instead of cl-mapcan, Jonas Bernoulli, 2024/12/06
- [nongnu] elpa/magit e8b85e43d4 23/28: magit-stash-push: Move "--" after other arguments, Jonas Bernoulli, 2024/12/06
- [nongnu] elpa/magit 908de59440 26/28: Update changelog, Jonas Bernoulli, 2024/12/06
- [nongnu] elpa/magit 961b966f9a 25/28: Require magit-process for the benefit of magit-auto-revert-mode, Jonas Bernoulli, 2024/12/06
- [nongnu] elpa/magit 621b67fc7e 15/28: magit-list-special-refnames: Cosmetics, Jonas Bernoulli, 2024/12/06