![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 6d3bfd19680faaee7272d2451e12cea4e7440cdb..8de880f83a2a33b16e0f8d3e8e9b90cdbb0cbfa1 100644 (file)
* The scripting part of the codebase is getting prepared for i18n/l10n.
* The scripting part of the codebase is getting prepared for i18n/l10n.
- * Interix and Cygwin ports got updated.
+ * Interix, Cygwin and Minix ports got updated.
+
+ * A handful of patches to update git-p4 (in contrib/).
+
+ * Gitweb learned to read from /etc/gitweb-common.conf when it exists,
+ before reading from gitweb_config.perl or from /etc/gitweb.conf
+ (this last one is read only when per-repository gitweb_config.perl
+ does not exist).
* Various codepaths that invoked zlib deflate/inflate assumed that these
functions can compress or uncompress more than 4GB data in one call on
* Various codepaths that invoked zlib deflate/inflate assumed that these
functions can compress or uncompress more than 4GB data in one call on
* "git archive" can be told to pass the output to gzip compression and
produce "archive.tar.gz".
* "git archive" can be told to pass the output to gzip compression and
produce "archive.tar.gz".
+ * "git bisect" can be used in a bare repository (provided if the test
+ you perform per each iteration does not need a working tree, of
+ course).
+
+ * "git check-attr" can take relative paths from the command line.
+
+ * "git check-attr" learned "--all" option to list the attributes for a
+ given path.
+
* "git checkout" (both the code to update the files upon checking out a
different branch, the code to checkout specific set of files) learned
to stream the data from object store when possible, without having to
* "git checkout" (both the code to update the files upon checking out a
different branch, the code to checkout specific set of files) learned
to stream the data from object store when possible, without having to
- read the entire contents of a file in memory first.
+ read the entire contents of a file in memory first. An earlier round
+ of this code that is not in any released version had a large leak but
+ now it has been plugged.
* "git clone" can now take "--config key=value" option to set the
repository configuration options that affect the initial checkout.
* "git clone" can now take "--config key=value" option to set the
repository configuration options that affect the initial checkout.
+ * "git commit <paths>..." now lets you feed relative pathspecs that
+ refer outside your current subdirectory.
+
* "git diff --stat" learned --stat-count option to limit the output of
diffstat report.
* "git diff --stat" learned --stat-count option to limit the output of
diffstat report.
+ * "git diff" learned "--histogram" option, to use a different diff
+ generation machinery stolen from jgit, which might give better
+ performance.
+
* "git fetch", "git push" and friends no longer show connection
errors for addresses that couldn't be connected when at least one
address succeeds (this is arguably a regression but a deliberate
* "git fetch", "git push" and friends no longer show connection
errors for addresses that couldn't be connected when at least one
address succeeds (this is arguably a regression but a deliberate
* "git grep" learned --break and --heading options, to let users mimic
output format of "ack".
* "git grep" learned --break and --heading options, to let users mimic
output format of "ack".
+ * "git grep" learned "-W" option that shows wider context using the same
+ logic used by "git diff" to determine the hunk header.
+
* "git rebase master topci" no longer spews usage hints after giving
"fatal: no such branch: topci" error message.
* "git rebase master topci" no longer spews usage hints after giving
"fatal: no such branch: topci" error message.
submodule; it now goes on to update other submodules that can be
updated, and reports the ones with errors at the end.
submodule; it now goes on to update other submodules that can be
updated, and reports the ones with errors at the end.
+ * "git upload-pack" and "git receive-pack" learned to pretend only a
+ subset of the refs exist in a repository. This may help a site to
+ put many tiny repositories into one repository (this would not be
+ useful for larger repositories as repacking would be problematic).
+
* "git verify-pack" has been rewritten to use the "index-pack" machinery
that is more efficient in reading objects in packfiles.
* "git verify-pack" has been rewritten to use the "index-pack" machinery
that is more efficient in reading objects in packfiles.
Unless otherwise noted, all the fixes in 1.7.6.X maintenance track are
included in this release.
Unless otherwise noted, all the fixes in 1.7.6.X maintenance track are
included in this release.
- * "git checkout -b <branch>" sometimes wrote a bogus reflog entry,
- causing later "git checkout -" fail.
- (merge 71ee7fd jc/checkout-reflog-fix~1 later).
-
- * "git diff --cc" learned to correctly ignore binary files.
- (merge 0508fe5 jk/combine-diff-binary-etc later)
-
- * "git fetch" did not recurse into submodules in subdirectories.
- (merge ea2d325 jl/maint-fetch-recursive-fix later)
-
- * "git rebase -i -p" incorrectly dropped commits from side branches.
- (merge 12bf828 aw/rebase-i-p later)
-
- * "git submodule add" did not allow a relative repository path when
- the superproject did not have any default remote url.
- (merge f22a17e8 jl/submodule-add-relurl-wo-upstream later)
+ * Error exits from $PAGER were silently ignored.
+ (merge fc1b56f cb/maint-exec-error-report later).
- * "git submodule foreach" failed to correctly give the standard input to
- the user-supplied command it invoked.
- (merge 4dca1aa bc/submodule-foreach-stdin-fix-1.7.4 later)
+ * "git diff -c/--cc" mishandled a deletion that resolves a conflict, and
+ looked in the working tree instead.
+ (merge 9969454 jc/maint-combined-diff-work-tree later).
- * submodules that the user has never showed interest in by running
- "git submodule init" was incorrectly marked as interesting by "git
- submodule sync".
- (merge 2cd9de3 jc/submodule-sync-no-auto-vivify later)
+ * "git fetch" over smart-http transport used to abort when the
+ repository was updated between the initial connection and the
+ subsequent object transfer.
+ (merge 051e400 jc/maint-smart-http-race-upload-pack later).
- * "git tag -l <glob>..." did not take multiple glob patterns from the
- command line.
- (merge 588d0e8 jk/tag-list-multiple-patterns later)
+ * "git push --quiet" was not really quiet.
+ (merge 0d086b8 cb/maint-quiet-push later).
--
exec >/var/tmp/1
echo O=$(git describe master)
--
exec >/var/tmp/1
echo O=$(git describe master)
-O=v1.7.6-344-g22f4128
+O=v1.7.6-548-g324b6b1
git log --first-parent --oneline $O..master
echo
git shortlog --no-merges ^maint ^$O master
git log --first-parent --oneline $O..master
echo
git shortlog --no-merges ^maint ^$O master