@@ -169,6 +169,42 @@ Performance, Internal Implementation, Development Support etc.
169169 * "git p4" used a location outside $GIT_DIR/refs/ to place its
170170 temporary branches, which has been moved to refs/git-p4-tmp/.
171171
172+ * Existing autoconf generated test for the need to link with pthread
173+ library did not check all the functions from pthread libraries;
174+ recent FreeBSD has some functions in libc but not others, and we
175+ mistakenly thought linking with libc is enough when it is not.
176+ (merge a9b02de ew/autoconf-pthread later to maint).
177+
178+ * When "git fsck" reports a broken link (e.g. a tree object contains
179+ a blob that does not exist), both containing object and the object
180+ that is referred to were reported with their 40-hex object names.
181+ The command learned the "--name-objects" option to show the path to
182+ the containing object from existing refs (e.g. "HEAD~24^2:file.txt").
183+
184+ * Allow http daemon tests in Travis CI tests.
185+ (merge d9d1426 ls/travis-enable-httpd-tests later to maint).
186+
187+ * Makefile assumed that -lrt is always available on platforms that
188+ want to use clock_gettime() and CLOCK_MONOTONIC, which is not a
189+ case for recent Mac OS X. The necessary symbols are often found in
190+ libc on many modern systems and having -lrt on the command line, as
191+ long as the library exists, had no effect, but when the platform
192+ removes librt.a that is a different matter--having -lrt will break
193+ the linkage.
194+
195+ This change could be seen as a regression for those who do need to
196+ specify -lrt, as they now specifically ask for NEEDS_LIBRT when
197+ building. Hopefully they are in the minority these days.
198+
199+ * Further preparatory work on the refs API before the pluggable
200+ backend series can land.
201+
202+ * Error handling in the codepaths that updates refs has been
203+ improved.
204+
205+ * The API to iterate over all the refs (i.e. for_each_ref(), etc.)
206+ has been revamped.
207+
172208
173209Also contains various documentation updates and code clean-ups.
174210
@@ -349,6 +385,35 @@ notes for details).
349385 contrast to "ours".
350386 (merge 715a51b js/am-call-theirs-theirs-in-fallback-3way later to maint).
351387
388+ * "git blame file" allowed the lineage of lines in the uncommitted,
389+ unadded contents of "file" to be inspected, but it refused when
390+ "file" did not appear in the current commit. When "file" was
391+ created by renaming an existing file (but the change has not been
392+ committed), this restriction was unnecessarily tight.
393+ (merge c66b470 mh/blame-worktree later to maint).
394+
395+ * "git add -N dir/file && git write-tree" produced an incorrect tree
396+ when there are other paths in the same directory that sorts after
397+ "file".
398+ (merge 6d6a782 nd/cache-tree-ita later to maint).
399+
400+ * "git fetch http://user:pass@host/repo..." scrubbed the userinfo
401+ part, but "git push" didn't.
402+ (merge 68f3c07 jk/push-scrub-url later to maint).
403+
404+ * "git merge" with renormalization did not work well with
405+ merge-recursive, due to "safer crlf" conversion kicking in when it
406+ shouldn't.
407+ (merge 1335d76 jc/renormalize-merge-kill-safer-crlf later to maint).
408+
409+ * The use of strbuf in "git rm" to build filename to remove was a bit
410+ suboptimal, which has been fixed.
411+ (merge deb8e15 rs/rm-strbuf-optim later to maint).
412+
413+ * An age old bug that caused "git diff --ignore-space-at-eol"
414+ misbehave has been fixed.
415+ (merge 044fb19 js/ignore-space-at-eol later to maint).
416+
352417 * Other minor clean-ups and documentation updates
353418 (merge e51b0df pb/commit-editmsg-path later to maint).
354419 (merge b333d0d jk/send-pack-stdio later to maint).
@@ -357,3 +422,7 @@ notes for details).
357422 (merge 82f6178 nd/doc-new-command later to maint).
358423 (merge fa90ab4 js/t3404-grammo-fix later to maint).
359424 (merge c61b2af lf/recv-sideband-cleanup later to maint).
425+ (merge 31471ba rs/use-strbuf-addbuf later to maint).
426+ (merge 503e224 nd/test-helpers later to maint).
427+ (merge 16726cf jc/doc-diff-filter-exclude later to maint).
428+ (merge fd2e7da rs/worktree-use-strbuf-absolute-path later to maint).
0 commit comments