chiark / gitweb /
Solve issues with fd-commit when no Auto Name is present
authorDaniel Martí <mvdan@mvdan.cc>
Mon, 4 Nov 2013 23:11:54 +0000 (00:11 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Mon, 4 Nov 2013 23:11:54 +0000 (00:11 +0100)
fd-commit

index 9f1a5a2165b0fb86a23069d08b4c9a1be1a6977c..e833e034fda8b3b8350aaa6f4bd269604cffb44d 100755 (executable)
--- a/fd-commit
+++ b/fd-commit
@@ -23,6 +23,7 @@ while read line; do
 
                [ -d metadata/$id ] && extra=metadata/$id
 
+               name=
                while read l; do
                        if [[ "$l" == "Auto Name:"* ]]; then
                                name=${l##*:}
@@ -30,7 +31,7 @@ while read line; do
                        fi
                done < "$file"
 
-               [ -n "$name" ] && id="$name ($id)"
+               [ -n "$name" ] && fullname="$name ($id)" || fullname=$id
 
                newbuild=0
                while read l; do
@@ -44,9 +45,9 @@ while read line; do
                done < <(git diff HEAD -- "$file")
 
                if [ $newbuild -eq 0 ]; then
-                       message="$id:"
+                       message="$fullname:"
                else
-                       message="Update $id to $version ($vercode)"
+                       message="Update $fullname to $version ($vercode)"
                fi
 
                commands+=("git commit -m '$message' -e -v -- $file $extra")