diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-14 15:58:46 +0900 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-05-14 16:05:05 +0900 |
| commit | 531a5db2f182164e5344344e3678245215a430d0 (patch) | |
| tree | 8dce731293cc38e2c5ea5d64bf07336bbb927f14 | |
| parent | 4f29a47afb727f8839ce7a1237ca8d4243d781fd (diff) | |
| download | subsurface-531a5db2f182164e5344344e3678245215a430d0.tar.gz | |
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 <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | save-git.c | 11 |
1 files changed, 10 insertions, 1 deletions
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); } |