Git v1.8.0-rc1

A release candidate Git v1.8.0-rc1 is now available for testing
at the usual places.

The release tarballs are found at:

http://code.google.com/p/git-core/downloads/list

and their SHA-1 checksums are:

625f820554f19f76da86258b7cc67408da032fea  git-1.8.0.rc1.tar.gz
47be50c68d9fcd1c83bfea01c18a6e3f2abd37b8  git-htmldocs-1.8.0.rc1.tar.gz
7854c309bd9befcb0cd737eb6c17085084a458fd  git-manpages-1.8.0.rc1.tar.gz

Also the following public repositories all have a copy of the v1.8.0-rc1
tag and the master branch that the tag points at:

url = git://repo.or.cz/alt-git.git
url = https://code.google.com/p/git-core/
url = git://git.sourceforge.jp/gitroot/git-core/git.git
url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
url = https://github.com/gitster/git

Git v1.8.0 Release Notes (draft)

Backward compatibility notes

In the next major release (not in 1.8.0 but the one that comes
after that), we will change the behavior of the “git push” command.
When “git push [$there]” does not say what to push, we have used the
traditional “matching” semantics so far (all your branches were sent
to the remote as long as there already are branches of the same name
over there). We will now use the “simple” semantics, that pushes
the current branch to the branch with the same name only when the
current branch is set to integrate with that remote branch. There
is a user preference configuration variable “push.default” to change
this, and “git push” will warn about the upcoming change until you
set this variable.

“git branch –set-upstream” is deprecated and may be removed in a
relatively distant future. “git branch [-u|–set-upstream-to]” has
been introduced with a saner order of arguments.

Updates since v1.7.12

UI, Workflows & Features

  • 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
    the even less common “RE: subject” intact. We strip that now, too.

  • 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
    unlikely what the user meant. The option is deprecated; use the
    new “–set-upstream-to” (with a short-and-sweet “-u”) option
    instead.

  • “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 difftool –dir-diff” learned to use symbolic links to prepare
    a temporary copy of the working tree when available.

  • “git grep” learned to use a non-standard pattern type by default if
    a configuration variable tells it to.

  • “git log -g” learned the “–grep-reflog=<pattern>” option to limit
    its output to commits with a reflog message that matches the given
    pattern.

  • “git merge-base” learned the “–is-ancestor A B” option to tell if A is
    an ancestor of B. The result is indicated by its exit status code.

  • “git mergetool” now allows users to override the actual command used
    with the mergetool.$name.cmd configuration variable even for built-in
    mergetool backends.

  • 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 instruction sheet.

Foreign Interface

  • “git svn” has been updated to work with SVN 1.7.

  • “git p4” learned the “–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 by mistake. 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 a 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 around some mkdir(2) implementations that
    reject parameters 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 a “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.

Fixes since v1.7.12

Unless otherwise noted, all the fixes since v1.7.12 in the
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 am” mishandled a patch attached as application/octet-stream
    (e.g. not text/*); Content-Transfer-Encoding (e.g. base64) was not
    honored 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.

  • It was unclear in the documentation for “git blame” that it is
    unnecessary for users to use the “–follow” option.

  • Output from “git branch -v” contains “(no branch)” that could be
    localized, but the code to align it along with the names of
    branches was 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.

  • A repository created with “git clone –single” had its fetch
    refspecs set up just like a clone without “–single”, leading the
    subsequent “git fetch” to slurp all the other branches, defeating
    the whole point of specifying “only this branch”.

  • 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 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.

  • 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, and this change has been reverted.

  • “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 the combination “–all –tags” makes
    much less sense than “–all –no-tags”).

  • “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.

  • “git fetch” over http advertised that it supports “deflate”, which
    is much less common, and did not advertise the more common “gzip” on
    its Accept-Encoding header.

  • “git gc –auto” notified the user that auto-packing has triggered
    even under the “–quiet” option.

  • After “gitk” showed the contents of a tag, neither “Reread
    references” nor “Reload” updated what is shown as the
    contents of it when the user overwrote the tag with “git tag -f”.

  • “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.

  • “git receive-pack” (the counterpart to “git push”) did not give
    progress output while processing objects it received to the puser
    when run over the smart-http protocol.

  • When you misspell the command name you give to the “exec” action in
    the “git rebase -i” instruction sheet you were 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 that “git send-email” gives was error prone. It
    asked “What e-mail address do you want to use?” with the address it
    guessed (correctly) the user would want to use in its prompt,
    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.

  • “git show –format=%ci” did not give the timestamp correctly for
    commits created without human readable name on the “committer” line.

  • “git show –quiet” ought to be a synonym for “git show -s”, but
    wasn’t.

  • “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”.

  • “git status” honored the ignore=dirty settings in .gitmodules but
    “git commit” didn’t.

Changes since v1.8.0-rc0 are as follows:

Ammon Riley (1):
      Make git-svn branch patterns match complete URL

Eric Wong (1):
      git-svn: use path accessor for Git::SVN objects

Jonathan Nieder (2):
      Git::SVN: rename private path field
      git-svn: keep leading slash when canonicalizing paths (fallback case)

Junio C Hamano (7):
      log --grep-reflog: reject the option without -g
      Start preparing for 1.7.12.3
      t1450: the order the objects are checked is undefined
      Update draft release notes to 1.8.0
      paint_down_to_common(): parse commit before relying on its timestamp
      Git 1.7.12.3
      Git 1.8.0-rc1

Linus Torvalds (1):
      mailinfo: don't require "text" mime type for attachments

Michael J Gruber (1):
      RelNotes/1.8.0: various typo and style fixes

Nguyễn Thái Ngọc Duy (3):
      grep: prepare for new header field filter
      revision: add --grep-reflog to filter commits by reflog messages
      revision: make --grep search in notes too if shown

Peter Krefting (1):
      l10n: Fix to Swedish translation

Ramkumar Ramachandra (1):
      Documentation: mention `push.default` in git-push.txt

Robert Luberda (1):
      t9164: Add missing quotes in test

Steven Walter (2):
      git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip
      git-svn.perl: keep processing all commits in parents_exclude

Tobias Ulmer (1):
      silence git gc --auto --quiet output

Junio C Hamano wrote on 08 Oct 2012

Advertisements