From 542784497707f6827ebd41ea94829c82e6c24cfd Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 30 Aug 2023 11:36:28 +0200 Subject: [PATCH] For each customer repository change the file ChangeLog in branch master as last step. The git commit for this file will be used as output, so this file has always be the last to be checked in. --- git/git_client.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git/git_client.cpp b/git/git_client.cpp index f3c4ae1..2dcacb3 100644 --- a/git/git_client.cpp +++ b/git/git_client.cpp @@ -120,7 +120,10 @@ QStringList GitClient::gitShowReason() { // %h: commit (short form) // %s: commit message // %cI: commit date, strict ISO 8601 format - Command c("git show -s --format=\"c=%h m=%s d=%cI\""); + // Note: use master branch. By convention, there is a ChangeLog file + // in the root of the repository, which has to be always the last file + // to be checked in when the customer repository somehow changed. + Command c("git show origin/master -s --format=\"c=%h m=%s d=%cI\""); if (c.execute(m_customerRepository)) { QString const s = c.getCommandResult().trimmed(); int const c = s.indexOf("c=");