From 531a5db2f182164e5344344e3678245215a430d0 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 14 May 2014 15:58:46 +0900 Subject: [PATCH] git save: add list of dive computers to the commit message This makes it much more obvious what is going on when you save in between importing multiple dive computers, since the last dive description otherwise stays the same. Signed-off-by: Linus Torvalds Signed-off-by: Dirk Hohndel --- save-git.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/save-git.c b/save-git.c index 2757757b2..6abba601a 100644 --- a/save-git.c +++ b/save-git.c @@ -845,6 +845,8 @@ static void create_commit_message(struct membuffer *msg) if (dive) { dive_trip_t *trip = dive->divetrip; const char *location = dive->location ? : "no location"; + struct divecomputer *dc = &dive->dc; + const char *sep = "\n"; if (dive->number) nr = dive->number; @@ -852,7 +854,14 @@ static void create_commit_message(struct membuffer *msg) put_format(msg, "dive %d: %s", nr, location); if (trip && trip->location && *trip->location && strcmp(trip->location, location)) put_format(msg, " (%s)", trip->location); - put_format(msg, "\n\n"); + put_format(msg, "\n"); + do { + if (dc->model && *dc->model) { + put_format(msg, "%s%s", sep, dc->model); + sep = ", "; + } + } while ((dc = dc->next) != NULL); + put_format(msg, "\n"); } put_format(msg, "Created by subsurface %s\n", VERSION_STRING); }