delta/git.git, branch jk/robustify-parse-commit

checkout: do not die when leaving broken detached HEAD

2013-10-24T22:43:51+00:00

If we move away from a detached HEAD that has broken or
corrupted commits, we might die in two places:

  1. Printing the "old HEAD was..." message.

  2. Printing the list of orphaned commits.

In both cases, we ignore the return value of parse_commit
and feed the resulting commit to the pretty-print machinery,
which will die() upon failing to read the commit object
itself.

Since both cases are ancillary to the real operation being
performed, let's be more robust and keep going. This lets
users more easily checkout away from broken history.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

use parse_commit_or_die instead of custom message

2013-10-24T22:43:51+00:00

Many calls to parse_commit detect errors and die. In some
cases, the custom error messages are more useful than what
parse_commit_or_die could produce, because they give some
context, like which ref the commit came from. Some, however,
just say "invalid commit". Let's convert the latter to use
parse_commit_or_die; its message is slightly more informative,
and it makes the error more consistent throughout git.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

use parse_commit_or_die instead of segfaulting

2013-10-24T22:43:50+00:00

Some unchecked calls to parse_commit should obviously die on
error, because their next step is to start looking at the
parsed fields, which will cause a segfault. These are
obvious candidates for parse_commit_or_die, which will be a
strict improvement in behavior.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

assume parse_commit checks for NULL commit

2013-10-24T22:43:50+00:00

The parse_commit function will check whether it was passed a
NULL commit pointer, and if so, return an error. There is no
need for callers to check this separately.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

assume parse_commit checks commit->object.parsed

2013-10-24T22:43:50+00:00

The parse_commit function will check the "parsed" flag of
the object and do nothing if it is set. There is no need
for callers to check the flag themselves, and doing so only
clutters the code.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

log_tree_diff: die when we fail to parse a commit

2013-10-24T22:43:50+00:00

We currently call parse_commit and then assume we can
dereference the resulting "tree" struct field. If parsing
failed, however, that field is NULL and we end up
segfaulting.

Instead of a segfault, let's print an error message and die
a little more gracefully.

Note that this should never happen in practice, but may
happen in a corrupt repository.

Signed-off-by: Jeff King 
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.