chiark / gitweb /
commitid.scad.pl: in Full*, swap count and commitid
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 5 Feb 2016 18:54:54 +0000 (18:54 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 5 Feb 2016 18:54:54 +0000 (18:54 +0000)
commitid.scad.pl

index 48585d5fd11909e402306a99ede5870aa166545c..9a7667dc82c9b4f1339451522e11bb6b0dc60529 100755 (executable)
@@ -99,8 +99,8 @@ $SIG{__WARN__} = sub { die @_; };
 #       git-rev-list --first-parent --count HEAD
 #       git-rev-parse HEAD
 #       eg
-#            Full6      1070
-#                     82f2a2
+#            Full6    82f2a2
+#                       1070
 #       If tree is dirty, + or * is suffixed to count (but not to
 #       commitid) reducing number of digits by 1.
 #
@@ -108,7 +108,8 @@ $SIG{__WARN__} = sub { die @_; };
 #   Full9T
 #   Full12T
 #   Full15T
-#       As Full but commit is split over two lines for a 3-line message
+#       As Full but commit is split over two lines for a 3-line message;
+#       dirty marker is in commitid.
 #
 #   FontDemo
 #
@@ -359,15 +360,15 @@ sub do_git () {
 
        if (defined $git_count && defined $git_object) {
            gentextmodule("Full$sz",
-                         rjustt($sz, $git_count.$git_dirty),
-                         ljustt($sz, $git_object, ''));
+                         ljustt($sz, $git_object, ''),
+                         rjustt($sz, $git_count.$git_dirty));
 
            if (!($sz % 2)) {
                my $e = $sz/2;
                gentextmodule("Full".($e*3)."T",
-                             rjustt($e, $git_count),
                              ljustt($e*2, $git_object, $git_dirty)
-                             =~ m/.{$e}/g);
+                             =~ m/.{$e}/g,
+                             rjustt($e, $git_count));
            }
        }
     }