delta/git.git/builtin, 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 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

Merge branch 'jk/cat-file-batch-optim'

2013-08-02T16:32:48+00:00

* jk/cat-file-batch-optim:
  Revert "cat-file: split --batch input lines on whitespace"

Revert "cat-file: split --batch input lines on whitespace"

2013-08-02T16:29:30+00:00

This reverts commit c334b87b30c1464a1ab563fe1fb8de5eaf0e5bac; the
update assumed that people only used the command to read from
"rev-list --objects" output, whose lines begin with a 40-hex object
name followed by a whitespace, but it turns out that scripts feed
random extended SHA-1 expressions (e.g. "HEAD:$pathname") in which
a whitespace has to be kept.

Merge branch 'ob/typofixes'

2013-08-01T19:01:01+00:00

* ob/typofixes:
  many small typofixes

Merge branch 'jc/rm-submodule-error-message'

2013-08-01T18:57:25+00:00

Consolidate two messages phrased subtly differently without a good
reason.

* jc/rm-submodule-error-message:
  builtin/rm.c: consolidate error reporting for removing submodules

Merge branch 'jx/clean-interactive'

2013-08-01T18:52:37+00:00

* jx/clean-interactive:
  git-clean: implement partial matching for selection
  Documentation/git-clean: fix description for range

Merge branch 'jk/commit-how-to-abort-cherry-pick'

2013-07-31T19:38:23+00:00

* jk/commit-how-to-abort-cherry-pick:
  commit: tweak empty cherry pick advice for sequencer