@@ -8,6 +8,9 @@ Updates since v1.7.5
88
99 * Updates the way content tags are handled in gitweb.
1010
11+ * Similar to branch names, tagnames that begin with "-" are now
12+ disallowed.
13+
1114 * Clean-up of the C part of i18n (but not l10n---please wait)
1215 continues.
1316
@@ -56,6 +59,8 @@ Updates since v1.7.5
5659 (or not setting it at all) restores the default behaviour of allowing
5760 fast-forward to happen when possible.
5861
62+ * p4-import (from contrib) learned a new option --preserve-user.
63+
5964 * "git rebase" that does not specify on top of which branch to rebase
6065 the current branch now uses @{upstream} of the current branch.
6166
@@ -65,6 +70,10 @@ Updates since v1.7.5
6570 * "git submodule update" learned "--force" option to get rid of local
6671 changes in submodules and replace them with the up-to-date version.
6772
73+ * "git status" and friends ignore .gitmodules file while the file is
74+ still in a conflicted state during a merge, to avoid using information
75+ that is not final and possibly corrupt with conflict markers.
76+
6877 * Compressed tarball gitweb generates is made without the timestamp of
6978 the tarball generation; snapshot from the same tree should result in
7079 a same tarball.
@@ -86,14 +95,26 @@ included in this release.
8695
8796 * The bash completion scripts should correctly work using zsh's bash
8897 completion emulation layer now.
89- (merge either fc/completion-zsh later)
98+ (merge fc/completion-zsh later)
99+
100+ * The logic to handle "&" (expand to UNIX username) in GECOS field
101+ miscounted the length of the name it formatted.
102+ (merge rg/copy-gecos-username later)
103+
104+ * "git cherry-pick -s resolve" failed to cherry-pick a root commit.
105+ (merge jk/cherry-pick-root-with-resolve later)
90106
91107 * "git config" used to choke with an insanely long line.
92108 (merge ef/maint-strbuf-init later)
93109
110+ * "git log --stdin path" with an input that has additional pathspec
111+ used to corrupt memory.
112+ (merge jc/maint-pathspec-stdin-and-cmdline later)
113+
94114 * "git send-pack" (hence "git push") over smalt-HTTP protocol could
95115 deadlock when the client side pack-object died early.
96116 (merge js/maint-send-pack-stateless-rpc-deadlock-fix later)
117+ (merge jk/git-connection-deadlock-fix later)
97118
98119---
99120exec >/var/tmp/1
0 commit comments