diff options
| author | Jim Meyering <meyering@redhat.com> | 2007-12-21 10:56:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-22 19:15:38 (GMT) |
| commit | cc216827936e40bc2e8886623fd44f55e0674932 (patch) | |
| tree | 89b9c3ccbf54a1eba855b4446f3f2903e69794dc /Documentation/git-merge.txt | |
| parent | 97bc00a4909fb73eba8a05dc89fe7914d7123245 (diff) | |
| download | git-cc216827936e40bc2e8886623fd44f55e0674932.zip git-cc216827936e40bc2e8886623fd44f55e0674932.tar.gz git-cc216827936e40bc2e8886623fd44f55e0674932.tar.bz2 | |
Don't dereference NULL upon lookup failure.
Instead, signal the error just like the case we do upon encountering
an object with an unknown type.
Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions