diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-14 05:55:00 +0900 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-05-14 06:16:41 +0900 |
| commit | 3159a90b0aa670c7a82f931412e681d195528aab (patch) | |
| tree | 8db2d3fa9095a2c7f864a76b9d0b1df4d6bde13b | |
| parent | ed6a42f6f2e4309edda0c7c02d8df229a32c9315 (diff) | |
| download | subsurface-3159a90b0aa670c7a82f931412e681d195528aab.tar.gz | |
git save: don't crash if the last dive isn't in a trip
The git save tries to generate a nice commit message based on the most
recent dive, but stupidly didn't check whether that dive was in a trip
or not, and unconditionally used the trip pointer to see if there was a
trip location.
Which works well enough if you always generate trips, but is an
unmitigated disaster otherwise. Oops.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | save-git.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/save-git.c b/save-git.c index 3fd8807c6..2757757b2 100644 --- a/save-git.c +++ b/save-git.c @@ -850,7 +850,7 @@ static void create_commit_message(struct membuffer *msg) nr = dive->number; put_format(msg, "dive %d: %s", nr, location); - if (trip->location && *trip->location && strcmp(trip->location, location)) + if (trip && trip->location && *trip->location && strcmp(trip->location, location)) put_format(msg, " (%s)", trip->location); put_format(msg, "\n\n"); } |