GIT 1.6.4.rc2

A release candidate GIT 1.6.4-rc2 is available at the usual places
for testing:

git-1.6.4.rc2.tar.{gz,bz2} (source tarball)
git-htmldocs-1.6.4.rc2.tar.{gz,bz2} (preformatted docs)
git-manpages-1.6.4.rc2.tar.{gz,bz2} (preformatted docs)

The RPM binary packages for a few architectures are found in:

testing/git-*-1.6.4.rc2-1.fc9.$arch.rpm (RPM)

The changes since -rc1 are all small fixes and documentation updates; we
are in a very good shape to expect 1.6.4 final by the end of the month.

GIT v1.6.4 Release Notes (draft)

With the next major release, “git push” into a branch that is
currently checked out will be refused by default. You can choose
what should happen upon such a push by setting the configuration
variable receive.denyCurrentBranch in the receiving repository.

To ease the transition plan, the receiving repository of such a
push running this release will issue a big warning when the
configuration variable is missing. Please refer to:

for more details on the reason why this change is needed and the
transition plan.

For a similar reason, “git push $there :$killed” to delete the branch
$killed in a remote repository $there, if $killed branch is the current
branch pointed at by its HEAD, gets a large warning. You can choose what
should happen upon such a push by setting the configuration variable
receive.denyDeleteCurrent in the receiving repository.

Updates since v1.6.3


  • gitweb Perl style clean-up.
  • git-svn updates, including a new –authors-prog option to map author
    names by invoking an external program, ‘git svn reset’ to unwind
    ‘git svn fetch’, support for more than one branches, etc.


  • We feed iconv with “UTF-8” instead of “utf8”; the former is
    understood more widely. Similarly updated test scripts to use
    encoding names more widely understood (e.g. use “ISO8850-1” instead
    of “ISO-8859-1”).
  • Various portability fixes/workarounds for different vintages of
    SunOS, IRIX, and Windows.
  • Git-over-ssh transport on Windows supports PuTTY plink and TortoisePlink.


  • Many repeated use of lstat() are optimized out in “checkout” codepath.
  • git-status (and underlying git-diff-index –cached) are optimized
    to take advantage of cache-tree information in the index.

(usability, bells and whistles)

  • “git add –edit” lets users edit the whole patch text to fine-tune what
    is added to the index.
  • “git am” accepts StGIT series file as its input.
  • “git bisect skip” skips to a more randomly chosen place in the hope
    to avoid testing a commit that is too close to a commit that is
    already known to be untestable.
  • “git cvsexportcommit” learned -k option to stop CVS keywords expansion
  • “git grep” learned -p option to show the location of the match using the
    same context hunk marker “git diff” uses.
  • https transport can optionally be told that the used client
    certificate is password protected, in which case it asks the
    password only once.
  • “git imap-send” is IPv6 aware.
  • “git log –graph” draws graphs more compactly by using horizonal lines
    when able.
  • “git log –decorate” shows shorter refnames by stripping well-known
    refs/* prefix.
  • “git push $name” honors remote.$name.pushurl if present before
    using remote.$name.url. In other words, the URL used for fetching
    and pushing can be different.
  • “git send-email” understands quoted aliases in .mailrc files (might
    have to be backported to 1.6.3.X).
  • “git send-email” can fetch the sender address from the configuration
    variable “sendmail.from” (and “sendmail..from”).
  • “git show-branch” can color its output.
  • “add” and “update” subcommands to “git submodule” learned –reference
    option to use local clone with references.
  • “git submodule update” learned –rebase option to update checked
    out submodules by rebasing the local changes.
  • “gitweb” can optionally use gravatar to adorn author/committer names.


  • A major part of the “git bisect” wrapper has moved to C.

Fixes since v1.6.3

All of the fixes in v1.6.3.X maintenance series are included in this
release, unless otherwise noted.

Here are fixes that this release has, but have not been backported to
v1.6.3.X series.

  • “git diff-tree -r -t” used to omit new or removed directories from
    the output. df533f3 (diff-tree -r -t: include added/removed
    directories in the output, 2009-06-13) may need to be cherry-picked
    to backport this fix.
  • The way sets up a Repository object was not friendly to callers
    that chdir around. It now internally records the repository location
    as an absolute path when autodetected.

exec >/var/tmp/1
echo O=$(git describe master)
git shortlog --no-merges $O..master ^maint

Changes since v1.6.4-rc1 are as follows:

Brandon Casey (4):
     refs.c: release file descriptor on error return
     sha1_name.c: avoid unnecessary strbuf_release rework/fix the NEEDS_RESOLV and NEEDS_LIBGEN tests properly unset NEEDS_SSL_WITH_CRYPTO when sha1 func is missing

Eric Wong (2):
     git svn: rename tests that had conflicting numbers
     git svn: fix reparenting when ugly http(s) URLs are used

Junio C Hamano (5):
     checkout -f: deal with a D/F conflict entry correctly
     push: do not give big warning when no preference is configured
     Updates to draft release notes to 1.6.4
     combine-diff.c: fix performance problem when folding common deleted lines
     diff --cc: a lost line at the beginning of the file is shown incorrectly

Martin Koegler (1):
     git stash: modernize use of "dashed" git-XXX calls

Michael J Gruber (1): Test git log --no-walk sort order

Mike Ralphson (1):
     cvsexportcommit: reorder tests to quiet intermittent failure

Pierre Habouzit (4):
     janitor: use NULL and not 0 for pointers.
     refactor: use bitsizeof() instead of 8 * sizeof()
     janitor: add DIV_ROUND_UP and use it.
     janitor: useless checks before free

SZEDER Gábor (1):
     Trailing whitespace and no newline fix

Yann Dirson (2):
     List send-email config options in config.txt.
     Improve doc for format-patch threading options.

Leave a Reply

Fill in your details below or click an icon to log in: Logo

You are commenting using your account. Log Out /  Change )

Google+ photo

You are commenting using your Google+ account. Log Out /  Change )

Twitter picture

You are commenting using your Twitter account. Log Out /  Change )

Facebook photo

You are commenting using your Facebook account. Log Out /  Change )


Connecting to %s