* A credential helper for Win32 to allow access to the keychain of
the logged-in user has been added.
+ * An initial port to HP NonStop.
+
* A credential helper to allow access to the Gnome keyring has been
added.
+ * When "git am" sanitizes the Subject: line, we strip the prefix from
+ "Re: subject" and also from a less common "re: subject", but left
+ even less common "RE: subject" intact.
+
* It was tempting to say "git branch --set-upstream origin/master",
but that tells Git to arrange the local branch "origin/master" to
integrate with the currently checked out branch, which is highly
* "git cherry-pick" learned the "--allow-empty-message" option to
allow it to replay a commit without any log message.
+ * After "git cherry-pick -s" gave control back to the user asking
+ help to resolve conflicts, concluding "git commit" used to need to
+ be run with "-s" if the user wants to sign it off; now the command
+ leaves the sign-off line in the log template.
+
* "git daemon" learned the "--access-hook" option to allow an
external command to decline service based on the client address,
repository path, etc.
* "git grep" learned to use a non-standard pattern type by default if
a configuration variable tells it to.
+ * "git merge-base" learned "--is-ancestor A B" option to tell if A is
+ an ancestor of B. The result is indicated by its exit status code.
+
+ * The "-Xours" backend option to "git merge -s recursive" now takes
+ effect even on binary files.
+
+ * "git rebase -i" learned the "--edit-todo" option to open an editor
+ to edit the insn sheet.
+
+
Foreign Interface
* "git svn" has been updated to work with SVN 1.7.
+ * "git p4" learned "--conflicts" option to specify what to do when
+ encountering a conflict during "p4 submit".
+
+
Performance, Internal Implementation, etc. (please report possible regressions)
+ * Git ships with a fall-back regexp implementation for platforms with
+ buggy regexp library, but it was easy for people to keep using their
+ platform regexp. A new test has been added to check this.
+
* The "check-docs" build target has been updated and greatly
simplified.
+ * The test suite is run under MALLOC_CHECK_ when running with glibc
+ that supports the feature.
+
* The documentation in the TeXinfo format was using indented output
for materials meant to be examples that are better typeset in
monospace.
- * Compatibility wrapper to learn the maximum number of file
- descriptors we can open around sysconf(_SC_OPEN_MAX) and
- getrlimit(RLIMIT_NO_FILE) has been introduced for portability.
-
* Compatibility wrapper around some mkdir(2) implementations that
reject parameter with trailing slash has been introduced.
+ * Compatibility wrapper for systems that lack usable setitimer() has
+ been added.
+
+ * The option parsing of "git checkout" had error checking, dwim and
+ defaulting missing options, all mixed in the code, and issuing an
+ appropriate error message with useful context was getting harder.
+ The code has been reorganized to allow giving a proper diagnosis
+ when the user says "git checkout -b -t foo bar" (e.g. "-t" is not a
+ good name for a branch).
+
+ * Many internal uses of "git merge-base" equivalent were only to see
+ if one commit fast-forwards to the other, which did not need the
+ full set of merge bases to be computed. They have been updated to
+ use less expensive checks.
+
* The heuristics to detect and silently convert latin1 to utf8 when
we were told to use utf-8 in the log message has been transplanted
from "mailinfo" to "commit" and "commit-tree".
* Messages given by "git <subcommand> -h" from many subcommands have
been marked for translation.
+
Also contains minor documentation updates and code clean-ups.
maintenance track are contained in this release (see release notes
to them for details).
+ * The attribute system may be asked for a path that itself or its
+ leading directories no longer exists in the working tree, and it is
+ fine if we cannot open .gitattribute file in such a case. Failure
+ to open per-directory .gitattributes with error status other than
+ ENOENT and ENOTDIR should be diagnosed, but it wasn't.
+
+ * When looking for $HOME/.gitconfig etc., it is OK if we cannot read
+ them because they do not exist, but we did not diagnose existing
+ files that we cannot read.
+
+ * When "git am" is fed an input that has multiple "Content-type: ..."
+ header, it did not grok charset= attribute correctly.
+
+ * "git blame MAKEFILE" run in a history that has "Makefile" but not
+ "MAKEFILE" should say "No such file MAKEFILE in HEAD", but got
+ confused on a case insensitive filesystem and failed to do so.
+
+ * Even during a conflicted merge, "git blame $path" always meant to
+ blame uncommitted changes to the "working tree" version; make it
+ more useful by showing cleanly merged parts as coming from the other
+ branch that is being merged.
+
+ * Output from "git branch -v" contains "(no branch)" that could be
+ localized, but the code to align it along with the names of
+ branches were counting in bytes, not in display columns.
+
* "git cherry-pick A C B" used to replay changes in A and then B and
then C if these three commits had committer timestamps in that
order, which is not what the user who said "A C B" naturally
expects.
- (merge a73e22e mz/cherry-pick-cmdline-order later to maint).
- * "git show --quiet" ought to be a synonym for "git show -s", but
- wasn't.
- (merge f9c75d8 jk/maint-quiet-is-synonym-to-s-in-log later to maint).
+ * Documentation talked about "first line of commit log" when it meant
+ the title of the commit. The description was clarified by defining
+ how the title is decided and rewording the casual mention of "first
+ line" to "title".
- * "git p4", when "--use-client-spec" and "--detect-branches" are used
- together, misdetected branches.
- (merge 21ef5df pw/p4-use-client-spec-branch-detection later to maint).
+ * "git cvsimport" did not thoroughly cleanse tag names that it
+ inferred from the names of the tags it obtained from CVS, which
+ caused "git tag" to barf and stop the import in the middle.
- * Output from "git branch -v" contains "(no branch)" that could be
- localized, but the code to align it along with the names of
- branches were counting in bytes, not in display columns.
- (merge 1452bd6 nd/branch-v-alignment later to maint).
+ * Earlier we made the diffstat summary line that shows the number of
+ lines added/deleted localizable, but it was found irritating having
+ to see them in various languages on a list whose discussion language
+ is English.
- * "git for-each-ref" did not currectly support more than one --sort
- option.
- (merge 3b51222 kk/maint-for-each-ref-multi-sort later to maint).
+ * "git fetch --all", when passed "--no-tags", did not honor the
+ "--no-tags" option while fetching from individual remotes (the same
+ issue existed with "--tags", but combination "--all --tags" makes
+ much less sense than "--all --no-tags").
- * Pushing to smart HTTP server with recent Git fails without having
- the username in the URL to force authentication, if the server is
- configured to allow GET anonymously, while requiring authentication
- for POST.
- (merge b81401c jk/maint-http-half-auth-push later to maint).
+ * "git fetch" over http had an old workaround for an unlikely server
+ misconfiguration; it turns out that this hurts debuggability of the
+ configuration in general, and has been reverted.
+ (merge 6ac964a sp/maint-http-info-refs-no-retry later to maint).
- * When looking for $HOME/.gitconfig etc., it is OK if we cannot read
- them because they do not exist, but we did not diagnose existing
- files that we cannot read.
+ * "git fetch" over http advertised that it supports "deflate", which
+ is much less common, and did not advertise more common "gzip" on
+ its Accept-Encoding header.
+ (merge aa90b96 sp/maint-http-enable-gzip later to maint).
+
+ * After "gitk" showed the contents of a tag, neither "Reread
+ references" nor "Reload" did not update what is shown as the
+ contents of it, when the user overwrote the tag with "git tag -f".
- * The synopsis said "checkout [-B branch]" to make it clear the
- branch name is a parameter to the option, but the heading for the
- option description was "-B::", not "-B branch::", making the
- documentation misleading. There may be room in documentation pages
- of other commands for similar improvements (hint, hint).
- (merge 45aaf03 jc/maint-doc-checkout-b-always-takes-branch-name later to maint).
-
- * "git log .." errored out saying it is both rev range and a path
- when there is no disambiguating "--" is on the command line.
- Update the command line parser to interpret ".." as a path in such
- a case.
- (merge 003c84f jc/dotdot-is-parent-directory later to maint).
-
- * "git apply -p0" did not parse pathnames on "diff --git" line
- correctly. This caused patches that had pathnames in no other
- places to be mistakenly rejected (most notably, binary patch that
- does not rename nor change mode). Textual patches, renames or mode
- changes have preimage and postimage pathnames in different places
- in a form that can be parsed unambiguously and did not suffer from
- this problem.
- (merge 6a2abdc jc/apply-binary-p0 later to maint).
-
- * The exit status code from "git config" was way overspecified while
- being incorrect. The implementation has been updated to give the
- documented status for a case that was documented, and introduce a
- new code for "all other errors".
- (merge 9409c7a jc/maint-config-exit-status later to maint).
-
- * "git foo" errored out with "Not a directory" when the user had a
- non-directory on $PATH, and worse yet it masked an alias "foo" from
- running. (merge a785508 jc/maint-sane-execvp-notdir later to
- maint).
+ * "git log --all-match --grep=A --grep=B" ought to show commits that
+ mention both A and B, but when these three options are used with
+ --author or --committer, it showed commits that mention either A or
+ B (or both) instead.
+
+ * "git p4", when "--use-client-spec" and "--detect-branches" are used
+ together, misdetected branches.
+
+ * When you misspell the command name you give to the "exec" action in
+ the "git rebase -i" insn sheet, you are told that 'rebase' is not a
+ git subcommand from "git rebase --continue".
+
+ * The subcommand in "git remote" to remove a defined remote was
+ "rm" and the command did not take a fully-spelled "remove".
* The interactive prompt "git send-email" gives was error prone. It
asked "What e-mail address do you want to use?" with the address it
tempting the user to say "y". But the response was taken as "No,
please use 'y' as the e-mail address instead", which is most
certainly not what the user meant.
- (merge 51bbccf jc/send-email-reconfirm later to maint).
-
- * "git stash apply/pop" did not trigger "rerere" upon conflicts
- unlike other mergy operations.
- (merge 743bf6d ph/stash-rerere later to maint).
- * "git submodule update -f" did not update paths in the working tree
- that has local changes.
- (merge 01d4721 sz/submodule-force-update later to maint).
+ * "git show --format='%ci'" did not give timestamp correctly for
+ commits created without human readable name on "committer" line.
- * We used curl_easy_strerror() without checking version of cURL,
- breaking the build for versions before curl 7.12.0.
- (merge 4246b0b js/no-curl-easy-strerror-on-old-curl later to maint).
-
- * Code to work around MacOS X UTF-8 gotcha has been cleaned up.
- (merge 9a27f96 rr/precompose-utf8-cleanup later to maint).
-
- * Documentation for the configuration file format had a confusing
- example.
- (merge d1e1fe7 mh/maint-config-doc-proxy-command later to maint).
-
- * "git submodule <cmd> path" did not error out when the path to the
- submodule was misspelt.
- (merge be9d0a3 hv/submodule-path-unmatch later to maint).
-
- * Some capabilities were asked by fetch-pack even when upload-pack
- did not advertise that they are available. fetch-pack has been
- fixed not to do so.
+ * "git show --quiet" ought to be a synonym for "git show -s", but
+ wasn't.
- * The output from "git diff -B" for a file that ends with an
- incomplete line did not put "\ No newline..." on a line of its own.
+ * "git submodule frotz" was not diagnosed as "frotz" being an unknown
+ subcommand to "git submodule"; the user instead got a complaint
+ that "git submodule status" was run with an unknown path "frotz".
+ (merge af9c9f9 rr/maint-submodule-unknown-cmd later to maint).