delta/git.git, branch fc/rev-parse-test-updates

rev-parse test: use standard test functions for setup

2013-09-03T20:01:40+00:00

Save the reader from learning specialized t6* setup functions
where familiar commands like test_commit, "git checkout --orphan",
and "git merge" will do.

While at it, wrap the setup commands in a test assertion so errors can
be caught and stray output suppressed when running without --verbose
as in other tests.

Signed-off-by: Felipe Contreras 
Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

rev-parse test: use test_cmp instead of "test" builtin

2013-09-03T19:55:30+00:00

Use test_cmp instead of passing two command substitutions to the
"test" builtin.  This way:

 - when tests fail, they can print a helpful diff if run with
   "--verbose"

 - the argument order "test_cmp expect actual" feels natural,
   unlike test  =  that seems backwards

 - the exit status from invoking git is checked, so if rev-parse
   starts segfaulting then the test will notice and fail

Use a custom function for this instead of test_cmp_rev to emphasize
that we are testing the output from "git rev-parse" with certain
arguments, not checking that the revisions are equal in abstract.

Reported-by: Felipe Contreras 
Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

rev-parse test: use test_must_fail, not "if ; then false; fi"

2013-09-03T19:54:52+00:00

This way, if rev-parse segfaults then the test will fail instead
of treating it the same way as a controlled failure.

Signed-off-by: Felipe Contreras 
Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

rev-parse test: modernize quoting and whitespace

2013-09-03T19:54:43+00:00

Instead of cramming everything in one line, put the test body in an
indented block after the opening test_expect_success line and quote
and put the closing quote on a line by itself.

Use single-quote instead of double-quote to quote the test body
for more useful --verbose output.

Signed-off-by: Felipe Contreras 
Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

Git 1.8.4

2013-08-23T18:49:46+00:00

Signed-off-by: Junio C Hamano

Typofix draft release notes to 1.8.4

2013-08-21T22:30:04+00:00

Signed-off-by: Junio C Hamano

Git 1.8.4-rc4

2013-08-19T17:34:14+00:00

As we had to revert two topics at the last minute, let's have
another (hopefully short) round of rc to make sure the final release
will be sound.

Signed-off-by: Junio C Hamano

Revert "Add new @ shortcut for HEAD"

2013-08-14T22:04:24+00:00

This reverts commit cdfd94837b27c220f70f032b596ea993d195488f, as it
does not just apply to "@" (and forms with modifiers like @{u}
applied to it), but also affects e.g. "refs/heads/@/foo", which it
shouldn't.

The basic idea of giving a short-hand might be good, and the topic
can be retried later, but let's revert to avoid affecting existing
use cases for now for the upcoming release.

Revert "git stash: avoid data loss when "git stash save" kills a directory"

2013-08-14T16:53:43+00:00

This reverts commit a73653130edd6a8977106d45a8092c09040f9132, as it
has been reported that "ls-files --killed" is too time-consuming in
a deep directory with too many untracked crufts (e.g. $HOME/.git
tracking only a few files).

We'd need to revisit it later but "ls-files --killed" needs to be
optimized before it happens.

Git 1.8.4-rc3

2013-08-13T18:10:18+00:00

Signed-off-by: Junio C Hamano