![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index e1d70bd27f5a905e8fa02f17d8a682b286491951..364e16d0d5a40bae90cc97e0d6c610d3c3221f22 100644 (file)
* Improved handling of views, labels and branches in git-p4 (in contrib).
* Improved handling of views, labels and branches in git-p4 (in contrib).
+ * "git-p4" (in contrib) suffered from unnecessary merge conflicts when
+ p4 expanded the embedded $RCS$-like keywords; it can be now told to
+ unexpand them.
+
+ * Some "git-svn" updates.
+
+ * "vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and
+ support incremental imports.
+
+ * The configuration mechanism learned an "include" facility; an
+ assignment to the include.path pseudo-variable causes the named
+ file to be included in-place when Git looks up configuration
+ variables.
+
* "git am" learned to pass "-b" option to underlying "git mailinfo", so
that bracketed string other than "PATCH" at the beginning can be kept.
* "git am" learned to pass "-b" option to underlying "git mailinfo", so
that bracketed string other than "PATCH" at the beginning can be kept.
lines are taken from the postimage, in order to make it easier to
view the output.
lines are taken from the postimage, in order to make it easier to
view the output.
+ * "diff-highlight" filter (in contrib/) was updated to produce more
+ aesthetically pleasing output.
+
+ * "git tag --list" can be given "--points-at <object>" to limit its
+ output to those that point at the given object.
+
* "git merge" in an interactive session learned to spawn the editor
by default to let the user edit the auto-generated merge message,
to encourage people to explain their merges better. Legacy scripts
can export MERGE_AUTOEDIT=no to retain the historical behaviour.
* "git merge" in an interactive session learned to spawn the editor
by default to let the user edit the auto-generated merge message,
to encourage people to explain their merges better. Legacy scripts
can export MERGE_AUTOEDIT=no to retain the historical behaviour.
+ Both "git merge" and "git pull" can be given --no-edit from the
+ command line to accept the auto-generated merge message.
+
+ * "gitweb" allows intermediate entries in the directory hierarchy
+ that leads to a projects to be clicked, which in turn shows the
+ list of projects inside that directory.
Performance
Performance
to parse_object() have been eliminated, to help performance in
repositories with excessive number of refs.
to parse_object() have been eliminated, to help performance in
repositories with excessive number of refs.
-Internal Implementation
+Internal Implementation (please report possible regressions)
* Recursive call chains in "git index-pack" to deal with long delta
chains have been flattened, to reduce the stack footprint.
* Recursive call chains in "git index-pack" to deal with long delta
chains have been flattened, to reduce the stack footprint.
- * Use of add_extra_ref() API is slowly getting removed, to make it
- possible to cleanly restructure the overall refs API.
+ * Use of add_extra_ref() API is now gone, to make it possible to
+ cleanly restructure the overall refs API.
+
+ * The command line parser of "git pack-objects" now uses parse-options
+ API.
* The test suite supports the new "test_pause" helper function.
* The test suite supports the new "test_pause" helper function.
+ * Parallel to the test suite, there is a beginning of performance
+ benchmarking framework.
+
* t/Makefile is adjusted to prevent newer versions of GNU make from
running tests in seemingly random order.
* t/Makefile is adjusted to prevent newer versions of GNU make from
running tests in seemingly random order.
releases are contained in this release (see release notes to them for
details).
releases are contained in this release (see release notes to them for
details).
- * When "git push" fails to update any refs, the client side did not
- report an error correctly to the end user.
- (merge 5238cbf sp/smart-http-failure-to-push later to maint).
-
- * "git push -q" was not sufficiently quiet.
- (merge d336572 cb/push-quiet later to maint).
-
- * "git log --first-parent $pathspec" did not stay on the first parent
- chain and veered into side branch from which the whole change to the
- specified paths came.
- (merge 36ed191 jc/maint-log-first-parent-pathspec later to maint).
-
- * Subprocesses spawned from various git programs were often left running
- to completion even when the top-level process was killed.
- (merge 10c6cdd cb/maint-kill-subprocess-upon-signal later to maint).
-
- * "git mergetool" now gives an empty file as the common base version
- to the backend when dealing with the "both sides added, differently"
- case.
- (merge ec245ba da/maint-mergetool-twoway later to maint).
-
- * "git submodule add $path" forgot to recompute the name to be stored
- in .gitmodules when the submodule at $path was once added to the
- superproject and already initialized.
- (merge 1017c1a jl/submodule-re-add later to maint).
-
- * Using "git grep -l/-L" together with options -W or --break may not
- make much sense as the output is to only count the number of hits
- and there is no place for file breaks, but the latter options made
- "-l/-L" to miscount the hits.
- (merge 50dd0f2 tr/grep-l-with-decoration later to maint).
+ * "gitweb" used to drop warnings in the log file when "heads" view is
+ accessed in a repository whose HEAD does not point at a valid
+ branch.
---
exec >/var/tmp/1
---
exec >/var/tmp/1
-O=v1.7.9-110-g873ce7c
+O=v1.7.9.2-261-gd065f68
echo O=$(git describe)
git log --first-parent --oneline ^maint $O..
echo
echo O=$(git describe)
git log --first-parent --oneline ^maint $O..
echo