diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2024-11-16 16:57:55 +0100 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2024-11-16 16:57:55 +0100 |
| commit | 8cee789f7a61a491d23a78360cbd2d626eda0f06 (patch) | |
| tree | 048a160c994307fabfcb24773916d9aaa3df3bd8 /lisp/magit-git.el | |
| parent | 15bf7dc53d539e64bf7a012d27120921a967fe56 (diff) | |
magit-anything-staged-p: Extend comment about Git v2.46.{0,1} bugs
Diffstat (limited to 'lisp/magit-git.el')
| -rw-r--r-- | lisp/magit-git.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/magit-git.el b/lisp/magit-git.el index ae71009..810bc8d 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)) |