From 8ff32b767fed94fe6e42d5a2e59a42dc8c26a808 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 8 Nov 2014 16:52:19 -0500
Subject: [PATCH] TW-1444

- TW-1444 Tag ordering is preserved, but should be sorted in reports.
---
 ChangeLog               | 1 +
 src/columns/ColTags.cpp | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3034ef399..f73174f46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -174,6 +174,7 @@
 - TW-1436 Parser hangs when multiple slashes are used.
 - TW-1437 taskd.trust has a bad default value.
 - TW-1441 task import continues happily if filename doesn't exist.
+- TW-1444 Tag ordering is preserved, but should be sorted in reports.
 - Removed deprecated 'echo.command' setting, in favor of the 'header' and
   'affected' verbosity tokens.
 - Removed deprecated 'edit.verbose' setting, in favor of the 'edit' verbosity
diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp
index e28ce120d..2ed54b00a 100644
--- a/src/columns/ColTags.cpp
+++ b/src/columns/ColTags.cpp
@@ -123,7 +123,14 @@ void ColumnTags::render (
     if (_style == "default" ||
         _style == "list")
     {
-      std::replace (tags.begin (), tags.end (), ',', ' ');
+      std::vector <std::string> allTags;
+      split (allTags, tags, ',');
+      if (allTags.size () > 1)
+      {
+        std::sort (allTags.begin (), allTags.end ());
+        join (tags, " ", allTags);
+      }
+
       std::vector <std::string> all;
       wrapText (all, tags, width, _hyphenate);