[ANNOUNCE] Git 1.7.10-rc0

[ANNOUNCE] Git 1.7.10-rc0

[Junio C Hamano]

A release candidate Git 1.7.10-rc0 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:

96d1d25fd4f681246009b24fcaa4e41d88223f5b  git-1.7.10.rc0.tar.gz
a8c76f12980a287e0f6a0f285768ab492caaed98  git-htmldocs-1.7.10.rc0.tar.gz
8f5f8aa4f692eb3d6e3549f6eb0fb0b5419c2f57  git-manpages-1.7.10.rc0.tar.gz

Also the following public repositories all have a copy of the v1.7.10.rc0
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

The other day, soon after announcement of the 1.7.9.3 maintenance
release, there was a report that some tests did not pass on one
platform.  Even though it is better than not seeing one, such a late
report saddens us, especially because the exact test breakage has
been in the master and next branches for quite some time for people
to catch before it goes to any released versions.

Please test this and later pre-releases to make sure no such late
report has to come for the upcoming 1.7.10 final.

Thanks.


Git v1.7.10 Release Notes (draft)
=========================

Compatibility Notes
-------------------

 * From this release on, the "git merge" command in an interactive
   session will start an editor when it automatically resolves the
   merge for the user to explain the resulting commit, just like the
   "git commit" command does when it wasn't given a commit message.

   If you have a script that runs "git merge" and keeps its standard
   input and output attached to the user's terminal, and if you do not
   want the user to explain the resulting merge commits, you can
   export GIT_MERGE_AUTOEDIT environment variable set to "no", like
   this:

	#!/bin/sh
	GIT_MERGE_AUTOEDIT=no
	export GIT_MERGE_AUTOEDIT

   to disable this behaviour (if you want your users to explain their
   merge commits, you do not have to do anything).  Alternatively, you
   can give the "--no-edit" option to individual invocations of the
   "git merge" command if you know everybody who uses your script has
   Git v1.7.8 or newer.


Updates since v1.7.9
--------------------

UI, Workflows & Features

 * Teams for localizing the messages from the Porcelain layer of
   commands are starting to form, thanks to Jiang Xin who volunteered
   to be the localization coordinator.  An initial set of translated
   messages for simplified chinese is available.

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

 * A content filter (clean/smudge) used to be just a way to make the
   recorded contents "more useful", and allowed to fail; a filter can
   new optionally be marked as "required".

 * Options whose names begin with "--no-" (e.g. the "--no-verify"
   option of the "git commit" command) can be negated by omitting
   "no-" from its name, e.g. "git commit --verify".

 * "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 clone" learned "--single-branch" option to limit cloning to a
   single branch (surprise!).

 * "git clone" learned to detach the HEAD in the resulting repository
   when the source repository's HEAD does not point to a branch.

 * When showing a patch while ignoring whitespace changes, the context
   lines are taken from the postimage, in order to make it easier to
   view the output.

 * "git diff --stat" learned to adjust the width of the output on
   wider terminals, and give more columns to pathnames as needed.

 * "diff-highlight" filter (in contrib/) was updated to produce more
   aesthetically pleasing output.

 * "fsck" learned "--no-dangling" option to omit dangling object
   information.

 * "git log -G" learned to pay attention to the "-i" option and can
   find patch hunks that introduce or remove a string that matches the
   given pattern ignoring the case.

 * "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 GIT_MERGE_AUTOEDIT=no to retain the historical behavior.
   Both "git merge" and "git pull" can be given --no-edit from the
   command line to accept the auto-generated merge message.

 * The advise message given when the user didn't give enough clue on
   what to merge to "git pull" and "git merge" has been updated to
   be more concise and easier to understand.

 * "git push" learned the "--prune" option, similar to "git fetch".

 * "git symbolic-ref" learned the "--short" option to abbreviate the
   refname it shows unambiguously.

 * "git tag --list" can be given "--points-at <object>" to limit its
   output to those that point at the given object.

 * "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.

 * "gitweb" learned to read various pieces of information for the
   repositories lazily, instead of reading everything that could be
   needed (including the ones that are not necessary for a specific
   task).

 * Project search in "gitweb" shows the substring that matched in the
   project name and description highlighted.

Foreign Interface

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

 * "git difftool/mergetool" learned to drive DeltaWalker.

Performance

 * Unnecessary calls to parse_object() "git upload-pack" makes in
   response to "git fetch", have been eliminated, to help performance
   in repositories with excessive number of refs.

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.

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

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

 * The code to check if a path points at a file beyond a symbolic link
   has been restructured to be thread-safe.

Also contains minor documentation updates and code clean-ups.


Fixes since v1.7.9
------------------

Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
releases are contained in this release (see release notes to them for
details).

 * "git bundle" did not record boundary commits correctly when there
   are many of them.
   (merge efe4be1 tr/maint-bundle-boundary later to maint).

 * "git diff-index" and its friends at the plumbing level showed the
   "diff --git" header and nothing else for a path whose cached stat
   info is dirty without actual difference when asked to produce a
   patch. This was a longstanding bug that we could have fixed long
   time ago.
   (merge b3f01ff jc/maint-diff-patch-header later to maint).

 * The code to synthesize the fake ancestor tree used by 3-way merge
   fallback in "git am" was not prepared to read a patch created with
   a non-standard -p<num> value.
   (merge a61ba26 jc/am-3-nonstandard-popt 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.

Re: [ANNOUNCE] Git 1.7.10-rc0

[Jeff King]

On Wed, Mar 07, 2012 at 05:35:07PM -0800, Junio C Hamano wrote:

>  * A content filter (clean/smudge) used to be just a way to make the
>    recorded contents "more useful", and allowed to fail; a filter can
>    new optionally be marked as "required".

s/new/now/

>  * "git am" learned to pass "-b" option to underlying "git mailinfo", so
>    that bracketed string other than "PATCH" at the beginning can be kept.

s/bracketed/a &/

(or s/string/&s/)

>  * "git clone" learned to detach the HEAD in the resulting repository
>    when the source repository's HEAD does not point to a branch.

Hmm. Hasn't this been the case for a while? The jk/clone-detached topic
went into v1.7.7, and it was just fixes for some corner cases; actually
writing a detached HEAD is much older than that, even.

I assume this entry is due to the nd/clone-detached topic. Reading over
those commits, it seems like it is more about properly checking the
"--branch" argument for being detached, so we can handle
"--branch=v1.0". So maybe:

  * "git clone" learned to detach the HEAD in the resulting repository
    when the user specifies a tag with "--branch" (e.g., "--branch=v1.0").
    Clone also learned to print the usual "detached HEAD" advice in such
    a case, similar to "git checkout v1.0".

>  * "git log -G" learned to pay attention to the "-i" option and can
>    find patch hunks that introduce or remove a string that matches the
>    given pattern ignoring the case.

This didn't parse well for me. Also, it affects -S, too, doesn't it?
Maybe:

  * "git log -G" and "git log -S" learned to pay attention to the "-i"
    option. When "-i" is given, their patterns will match
    case-insensitively.

>  * The advise message given when the user didn't give enough clue on
>    what to merge to "git pull" and "git merge" has been updated to
>    be more concise and easier to understand.

s/advise/advice/

-Peff

Re: [ANNOUNCE] Git 1.7.10-rc0

[Junio C Hamano]

Jeff King <peff@peff.net> writes:

Thanks to all other points.

>>  * "git log -G" learned to pay attention to the "-i" option and can
>>    find patch hunks that introduce or remove a string that matches the
>>    given pattern ignoring the case.
>
> This didn't parse well for me. Also, it affects -S, too, doesn't it?
> Maybe:
>
>   * "git log -G" and "git log -S" learned to pay attention to the "-i"
>     option. When "-i" is given, their patterns will match
>     case-insensitively.

I was torn about this item, and indeed my earlier draft read like
yours but I removed "-S" as it felt it was more confusing than it
was worth.  The thing is that -S does not take any pattern --- it is
meant to be given a (typically a multi-line) block of text to find
where the exact block cease to exist in the file.

Re: [ANNOUNCE] Git 1.7.10-rc0

[Junio C Hamano]

Jeff King <peff@peff.net> writes:

Thanks to all other points.

>>  * "git log -G" learned to pay attention to the "-i" option and can
>>    find patch hunks that introduce or remove a string that matches the
>>    given pattern ignoring the case.
>
> This didn't parse well for me. Also, it affects -S, too, doesn't it?
> Maybe:
>
>   * "git log -G" and "git log -S" learned to pay attention to the "-i"
>     option. When "-i" is given, their patterns will match
>     case-insensitively.

I was torn about this item, and indeed my earlier draft read like
yours but I removed "-S" as it felt it was more confusing than it
was worth.  The thing is that -S does not take any pattern --- it is
meant to be given a (typically a multi-line) block of text to find
where the exact block cease to exist in the file.

 * "git log -G" and "git log -S" learned to pay attention to the "-i"
   option.  With "-i", "log -G" finds patch hunks that introduce or
   remove a string that matches the given pattern ignoring the case.
   Similarly with "-i", "log -S" finds where the given block of text
   appears or disappears from the file, but this comparison is done
   case-insensitively.

Re: [ANNOUNCE] Git 1.7.10-rc0

[Jeff King]

On Wed, Mar 07, 2012 at 10:46:47PM -0800, Junio C Hamano wrote:

> >   * "git log -G" and "git log -S" learned to pay attention to the "-i"
> >     option. When "-i" is given, their patterns will match
> >     case-insensitively.
> 
> I was torn about this item, and indeed my earlier draft read like
> yours but I removed "-S" as it felt it was more confusing than it
> was worth.  The thing is that -S does not take any pattern --- it is
> meant to be given a (typically a multi-line) block of text to find
> where the exact block cease to exist in the file.

Yeah, though I think many people do treat it as a fixed-string pattern
(I typically use "git log -Sfoo" to search for "foo", though perhaps
that is because I trained my fingers long before "-G" existed. "-S" is
also a lot faster).

My initial reaction to your statement was "well, if we can't justify it
in the release notes, then perhaps it is wrong for -S to be respecting
-i". But I don't think that is right. The code is doing the right thing,
and it is merely that "-S" is a little-used and often-misunderstood
tool, and you would naturally want to avoid mentioning it to avoid
complicating the notes and confusing the reader.

>  * "git log -G" and "git log -S" learned to pay attention to the "-i"
>    option.  With "-i", "log -G" finds patch hunks that introduce or
>    remove a string that matches the given pattern ignoring the case.
>    Similarly with "-i", "log -S" finds where the given block of text
>    appears or disappears from the file, but this comparison is done
>    case-insensitively.

I think that's much better.

Though as a minor nit, the thing I had trouble parsing originally was
"...that matches the given pattern ignoring the case". I think "...ignores
the case when finding patch hunks that introduce..." is a little easier
to read.

-Peff

[PATCH 1/2] perf: load test-lib-functions from the correct directory

[Thomas Rast]

Loading it in the subshells still referred to $TEST_DIRECTORY/..,
which was only correct in preliminary versions of perf-lib.sh

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---

This and the next one fix two small bugs in the perf test suite.  They
don't affect anyone so far, which is why they went unnoticed.

 t/perf/p0000-perf-lib-sanity.sh |    5 +++++
 t/perf/perf-lib.sh              |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/t/perf/p0000-perf-lib-sanity.sh b/t/perf/p0000-perf-lib-sanity.sh
index 2ca4aac..f8dd536 100755
--- a/t/perf/p0000-perf-lib-sanity.sh
+++ b/t/perf/p0000-perf-lib-sanity.sh
@@ -38,4 +38,9 @@ test_expect_success 'test_export works with weird vars' '
 	test "$bar" = "weird # variable"
 '
 
+test_perf 'test-lib-functions correctly loaded in subshells' '
+	: >a &&
+	test_path_is_file a
+'
+
 test_done
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index 2a5e1f3..bcc0131 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -119,7 +119,7 @@ test_run_perf_ () {
 	test_export_="test_cleanup"
 	export test_cleanup test_export_
 	/usr/bin/time -f "%E %U %S" -o test_time.$i "$SHELL" -c '
-. '"$TEST_DIRECTORY"/../test-lib-functions.sh'
+. '"$TEST_DIRECTORY"/test-lib-functions.sh'
 test_export () {
 	[ $# != 0 ] || return 0
 	test_export_="$test_export_\\|$1"
-- 
1.7.9.3.556.g7eb2d

[PATCH 2/2] perf: export some important test-lib variables

[Thomas Rast]

The only bug right now is that $GIT_TEST_CMP is needed for test_cmp to
work.

However, we also export the three most important paths for tests:

  TEST_DIRECTORY
  TRASH_DIRECTORY
  GIT_BUILD_DIR

Since they are available within test_expect_success, a future test
writer may expect them to also be defined in test_perf.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
 t/perf/p0000-perf-lib-sanity.sh |   11 ++++++++++-
 t/perf/perf-lib.sh              |    4 ++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/t/perf/p0000-perf-lib-sanity.sh b/t/perf/p0000-perf-lib-sanity.sh
index f8dd536..cf8e1ef 100755
--- a/t/perf/p0000-perf-lib-sanity.sh
+++ b/t/perf/p0000-perf-lib-sanity.sh
@@ -38,9 +38,18 @@ test_expect_success 'test_export works with weird vars' '
 	test "$bar" = "weird # variable"
 '
 
+test_perf 'important variables available in subshells' '
+	test -n "$HOME" &&
+	test -n "$TEST_DIRECTORY" &&
+	test -n "$TRASH_DIRECTORY" &&
+	test -n "$GIT_BUILD_DIR"
+'
+
 test_perf 'test-lib-functions correctly loaded in subshells' '
 	: >a &&
-	test_path_is_file a
+	test_path_is_file a &&
+	: >b &&
+	test_cmp a b
 '
 
 test_done
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index bcc0131..5580c22 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -45,6 +45,10 @@ TEST_NO_CREATE_REPO=t
 
 . ../test-lib.sh
 
+# Variables from test-lib that are normally internal to the tests; we
+# need to export them for test_perf subshells
+export TEST_DIRECTORY TRASH_DIRECTORY GIT_BUILD_DIR GIT_TEST_CMP
+
 perf_results_dir=$TEST_OUTPUT_DIRECTORY/test-results
 mkdir -p "$perf_results_dir"
 rm -f "$perf_results_dir"/$(basename "$0" .sh).subtests
-- 
1.7.9.3.556.g7eb2d

Re: [ANNOUNCE] Git 1.7.10-rc0

[Thomas Rast]

Junio C Hamano <gitster@pobox.com> writes:

>  * Parallel to the test suite, there is a beginning of performance
>    benchmarking framework.

I just noticed that this does not work on OS X; its 'time' does not
support the -f option.  For now I think I'm happy; it can compare
several versions of Git on Linux to detect performance improvements or
regressions.  Comparability across systems or platforms was never a main
goal.

In the long run we'll have to change it to either use 'time -p'
everywhere and parse that into shape -- at least GNU and OS X agree on
what POSIX specifies ;-) -- or just supply a small helper utility that
does the timings for us in a ready-to-use format.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch

Re: [ANNOUNCE] Git 1.7.10-rc0

[Nguyen Thai Ngoc Duy]

On Thu, Mar 8, 2012 at 8:35 AM, Junio C Hamano <gitster@pobox.com> wrote:
>  * "git clone" learned "--single-branch" option to limit cloning to a
>   single branch (surprise!).

--single-branch also limits fetching tags to minimum, I'm not sure we
need to mention that. It may be a good idea to mention "shallow clone"
or --depth, where this feature is most beneficial, to catch people's
eyes if they are interested in shallow clone.
-- 
Duy

Re: [ANNOUNCE] Git 1.7.10-rc0

[Jakub Narebski]

Junio C Hamano <gitster@pobox.com> writes:

> Updates since v1.7.9
> --------------------
> 
> UI, Workflows & Features
[...]
>  * "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.
> 
>  * "gitweb" learned to read various pieces of information for the
>    repositories lazily, instead of reading everything that could be
>    needed (including the ones that are not necessary for a specific
>    task).
> 
>  * Project search in "gitweb" shows the substring that matched in the
>    project name and description highlighted.


[...]
> Fixes since v1.7.9
> ------------------
> 
> Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
> releases are contained in this release (see release notes to them for
> details).
[...]

>  * "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.

It looks like fix for fixed-string project search is missing.

Nb. I don't know if it is worth mentioning, and if it should be in
"Fixes" or "Updates", but gitweb now supports utf-8 search, anc checks
regular expression for validity before using it in search.

-- 
Jakub Narebski

Re: [ANNOUNCE] Git 1.7.10-rc0

[Tim Henigan]

On Wed, Mar 7, 2012 at 8:35 PM, Junio C Hamano <gitster@pobox.com> wrote:
>
> Updates since v1.7.9
> --------------------
>
> UI, Workflows & Features

Are additions to contrib/ normally mentioned here?  If so, this the
first release to include "git diffall" (commit 1252bbe1c685).

Re: [ANNOUNCE] Git 1.7.10-rc0

[Marc Branchaud]

On 12-03-07 08:35 PM, Junio C Hamano wrote:
>

[ snip ]

>
>   * "gitweb" allows intermediate entries in the directory hierarchy
>     that leads to a projects to be clicked, which in turn shows the

s/projects/project/

>     list of projects inside that directory.

		M.

Re: [ANNOUNCE] Git 1.7.10-rc0

[Junio C Hamano]

Jakub Narebski <jnareb@gmail.com> writes:

> Junio C Hamano <gitster@pobox.com> writes:
> ...
>> Fixes since v1.7.9
>> ------------------
>> 
>> Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
>> releases are contained in this release (see release notes to them for
>> details).
> [...]
>
>>  * "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.
>
> It looks like fix for fixed-string project search is missing.

Hasn't it been already fixed in the 1.7.9.x maintenance track?

Re: [ANNOUNCE] Git 1.7.10-rc0

[Jakub Narebski]

Junio C Hamano wrote:
> Jakub Narebski <jnareb@gmail.com> writes:
> > Junio C Hamano <gitster@pobox.com> writes:
> > ...
> >> Fixes since v1.7.9
> >> ------------------
> >> 
> >> Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
> >> releases are contained in this release (see release notes to them for
> >> details).
> > [...]
> >
> >>  * "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.
> >
> > It looks like fix for fixed-string project search is missing.
> 
> Hasn't it been already fixed in the 1.7.9.x maintenance track?

I don't see it either in 'maint' or in 'master'.

It is surely not in master, otherwise 'stg rebase' would drop the
"gitweb: Fix fixed string (non-regexp) project search" patch.

-- 
Jakub Narebski
Poland

Re: [ANNOUNCE] Git 1.7.10-rc0

[Junio C Hamano]

Nguyen Thai Ngoc Duy <pclouds@gmail.com> writes:

> On Thu, Mar 8, 2012 at 8:35 AM, Junio C Hamano <gitster@pobox.com> wrote:
>>  * "git clone" learned "--single-branch" option to limit cloning to a
>>   single branch (surprise!).
>
> --single-branch also limits fetching tags to minimum, I'm not sure we
> need to mention that.

Yeah, I was of two minds when I wrote it. It is obvious once you
think about it, but spelling it out does not cost much, so let's do
this.

 * "git clone" learned "--single-branch" option to limit cloning to a
   single branch (surprise!); tags that do not point into the history
   of the branch are not fetched.

Thanks.

Re: [ANNOUNCE] Git 1.7.10-rc0

[Junio C Hamano]

Jeff King <peff@peff.net> writes:

> Though as a minor nit, the thing I had trouble parsing originally was
> "...that matches the given pattern ignoring the case". I think "...ignores
> the case when finding patch hunks that introduce..." is a little easier
> to read.

Thanks, will do.

Re: [ANNOUNCE] Git 1.7.10-rc0

[Junio C Hamano]

Jakub Narebski <jnareb@gmail.com> writes:

> I don't see it either in 'maint' or in 'master'.
>
> It is surely not in master, otherwise 'stg rebase' would drop the
> "gitweb: Fix fixed string (non-regexp) project search" patch.

That is because some of the topics were still very new to 'next' and
I didn't want to disrupt the zeroth release candidates with them.  I
think the following topics should be on 'master' before -rc1:

 + vr/branch-doc                                                03-06/03-06    #3
 + jn/maint-do-not-match-with-unsanitized-searchtext            03-06/03-06    #1
 + jl/maint-submodule-relative                                  03-04/03-07    #4

The two dates are the day the last patch in the series hit my tree,
and the day the topic as a whole has become part of next, and #<num>
shows the number of patches in the series (you can run "cook -w -"
and feed the "What's cooking" message into its standard input to get
the summary; both are available in the 'todo' branch).

Re: [ANNOUNCE] Git 1.7.10-rc0

[Junio C Hamano]

Tim Henigan <tim.henigan@gmail.com> writes:

> On Wed, Mar 7, 2012 at 8:35 PM, Junio C Hamano <gitster@pobox.com> wrote:
>>
>> Updates since v1.7.9
>> --------------------
>>
>> UI, Workflows & Features
>
> Are additions to contrib/ normally mentioned here?

Usually not.  You could send a patch whose addition does not exceed
three lines if you want, though.

[PATCH] RelNotes: noted the addition of contrib/diffall

[Tim Henigan]

Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
---

I wasn't sure if you wanted an actual patch or just wanted me to write
up the paragraph.  If you squash this in to some other commit, that is
fine with me.


 Documentation/RelNotes/1.7.10.txt |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/Documentation/RelNotes/1.7.10.txt b/Documentation/RelNotes/1.7.10.txt
index ae446e0..60722e2 100644
--- a/Documentation/RelNotes/1.7.10.txt
+++ b/Documentation/RelNotes/1.7.10.txt
@@ -106,6 +106,9 @@ UI, Workflows & Features
  * Project search in "gitweb" shows the substring that matched in the
    project name and description highlighted.
 
+ * "git diffall" can now be installed from contrib/. The script drives
+   an external tool to perform a directory diff of two Git revisions.
+
 Foreign Interface
 
  * Improved handling of views, labels and branches in "git-p4" (in contrib).
-- 
1.7.10.rc0

Re: [PATCH] RelNotes: noted the addition of contrib/diffall

[Junio C Hamano]

Tim Henigan <tim.henigan@gmail.com> writes:

> I wasn't sure if you wanted an actual patch or just wanted me to write
> up the paragraph.  If you squash this in to some other commit, that is
> fine with me.

I didn't mean to burden you with a proper patch submission and just
a paragraph write-up was perfectly fine.

> + * "git diffall" can now be installed from contrib/. The script drives
> +   an external tool to perform a directory diff of two Git revisions.

I'm tempted to add a third line, like this:

   ... an external tool to perform a directory diff of two Git revisions
   in one go, unlike "difftool" which compares one-file-at-a-time.

to make the true value of this new addition stand out.

Thanks.

Re: [PATCH] RelNotes: noted the addition of contrib/diffall

[Tim Henigan]

On Fri, Mar 9, 2012 at 1:15 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Tim Henigan <tim.henigan@gmail.com> writes:
>
>> + * "git diffall" can now be installed from contrib/. The script drives
>> +   an external tool to perform a directory diff of two Git revisions.
>
> I'm tempted to add a third line, like this:
>
>   ... an external tool to perform a directory diff of two Git revisions
>   in one go, unlike "difftool" which compares one-file-at-a-time.
>
> to make the true value of this new addition stand out.

I like the added third line, but would remove the dashes in
"one-file-at-a-time".

Thanks,
Tim

Re: [PATCH 2/2] perf: export some important test-lib variables

[Ramkumar Ramachandra]

Hi Thomas,

Thomas Rast wrote:
> The only bug right now is that $GIT_TEST_CMP is needed for test_cmp to
> work.

What bug?  You're exporting it, right?

>  test_perf 'test-lib-functions correctly loaded in subshells' '
>         : >a &&
> -       test_path_is_file a
> +       test_path_is_file a &&
> +       : >b &&
> +       test_cmp a b
>  '

This test fails, presumably because of test_cmp.

Ram