Commit: 03e96d9d2237d90ada6259f1d97e1e5d5824a5ce - git-mq (git)

Mercurial Queues Emulation for Git

Commit MetaInfo

• Revisión: 03e96d9d2237d90ada6259f1d97e1e5d5824a5ce (tree)
• Tiempo: 2022-02-08 20:13:41
• Autor: Keith Marshall <keith@user...>
• Commiter: Keith Marshall

Log Message

Handle "git qfold" operations with no commit message.

* git-qfold.shar (mq_msg_file) [no content]: Insert default text; this
is required to ensure that a commit message is available, when running
"git commit", to complete the "git qfold" operation.

Cambiar Resumen

• modified: git-qfold.shar

Diferencia incremental

--- a/git-qfold.shar
+++ b/git-qfold.shar
@@ -6,7 +6,7 @@
 # $Id$
 #
 # Written by Keith Marshall <[e-mail]>
-# Copyright (C) 2019, Keith Marshall
+# Copyright (C) 2019, 2022, Keith Marshall
 #
 #
 # This file is part of the Git-MQ program suite.
@@ -202,7 +202,14 @@ printf '%s\n' "$@" | awk >&2 "$mq_series $mq_status $mq_error_handler"'
       }
       close( cmd );
     }
-# ...generate an updated copy of the series file, omitting entries
+# ...checking that at least one of the folded patches has contributed
+# content to this commit message, but providing a default, on which we
+# may fall back, in the event that none has...
+#
+    if( ! mq_msg_lines )
+    { print "[Git-MQ]: '"$mq_patchname"'" > "'"$mq_msg_file"'";
+    }
+# ...then generate an updated copy of the series file, omitting entries
 # for each of the folded patches...
 #
     for( idx = 0; entries > idx; idx++ )