diff options
| -rw-r--r-- | Documentation/RelNotes/2.24.0.txt | 11 | ||||
| -rw-r--r-- | compat/mingw.c | 2 | ||||
| -rw-r--r-- | gitweb/static/js/blame_incremental.js | 2 | ||||
| -rwxr-xr-x | t/t7519-status-fsmonitor.sh | 8 |
4 files changed, 14 insertions, 9 deletions
diff --git a/Documentation/RelNotes/2.24.0.txt b/Documentation/RelNotes/2.24.0.txt index 125169d0da..bde154124c 100644 --- a/Documentation/RelNotes/2.24.0.txt +++ b/Documentation/RelNotes/2.24.0.txt @@ -6,10 +6,9 @@ Updates since v2.23 Backward compatibility note - * Although it is not officially deprecated, "filter-branch" is - showing its age and alternatives are available. From this release, - we started to discourage its uses and hint people about - filter-repo. + * "filter-branch" is showing its age and alternatives are available. + From this release, we started to discourage its use and hint + people about filter-repo. UI, Workflows & Features @@ -316,7 +315,7 @@ Fixes since v2.23 to access the worktree correctly, which has been corrected. (merge dfd557c978 js/stash-apply-in-secondary-worktree later to maint). - * The merge-recursive machiery is one of the most complex parts of + * The merge-recursive machinery is one of the most complex parts of the system that accumulated cruft over time. This large series cleans up the implementation quite a bit. (merge b657047719 en/merge-recursive-cleanup later to maint). @@ -395,3 +394,5 @@ Fixes since v2.23 (merge 3b3c79f6c9 nr/diff-highlight-indent-fix later to maint). (merge 3444ec2eb2 wb/fsmonitor-bitmap-fix later to maint). (merge 10da030ab7 cb/pcre2-chartables-leakfix later to maint). + (merge 60e6569a12 js/mingw-needs-hiding-fix later to maint). + (merge 52bd3e4657 rl/gitweb-blame-prev-fix later to maint). diff --git a/compat/mingw.c b/compat/mingw.c index 6b765d936c..fe609239dd 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -363,6 +363,8 @@ static inline int needs_hiding(const char *path) /* ignore trailing slashes */ if (*path) basename = path; + else + break; } if (hide_dotfiles == HIDE_DOTFILES_TRUE) diff --git a/gitweb/static/js/blame_incremental.js b/gitweb/static/js/blame_incremental.js index db6eb50584..e100d8206b 100644 --- a/gitweb/static/js/blame_incremental.js +++ b/gitweb/static/js/blame_incremental.js @@ -484,7 +484,7 @@ function processBlameLines(lines) { case 'previous': curCommit.nprevious++; // store only first 'previous' header - if (!'previous' in curCommit) { + if (!('previous' in curCommit)) { var parts = data.split(' ', 2); curCommit.previous = parts[0]; curCommit.file_parent = unquote(parts[1]); diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh index d8df990972..997d5fb349 100755 --- a/t/t7519-status-fsmonitor.sh +++ b/t/t7519-status-fsmonitor.sh @@ -354,9 +354,11 @@ test_expect_success 'discard_index() also discards fsmonitor info' ' test_cmp expect actual ' -# Test staging/unstaging files that appear at the end of the index. Test -# file names begin with 'z' so that they are sorted to the end of the index. -test_expect_success 'status succeeds after staging/unstaging ' ' +# Test unstaging entries that: +# - Are not flagged with CE_FSMONITOR_VALID +# - Have a position in the index >= the number of entries present in the index +# after unstaging. +test_expect_success 'status succeeds after staging/unstaging' ' test_create_repo fsmonitor-stage-unstage && ( cd fsmonitor-stage-unstage && |