version control - How to compare two git branches and filter the differences by commit message? -


i have release branch named release/x.x.x.x contains feature branches want deploy production. release branch made on top of master current state of production.

on every release day make sure our release branch contains changes planned release. use command compare release , master branch: git log release/x.x.x.x ^master --no-merges. manually check commits keywords "shr-1234" represent ticket numbers in our ticket management system. need compare each commit list of ticket numbers identify unwanted changes.

how can filter commits returned git log release/x.x.x.x ^master --no-merges , do not contain keywords "shr-1234"? way can identify ticket number of unwanted changes.

i tried grep , awk results not useful because don't filter out whole commit.

the git log command provides 2 interesting options here:

--grep=<pattern>
       limit commits output ones log message matches specified pattern (regular expression). more 1 --grep=<pattern>, commits message matches of given patterns chosen (but see --all-match).

       when --show-notes in effect, message notes matched if part of log message.

hence --grep lets find commits do contain particular string or pattern. want commits do not contain (any or all) strings, move on to:

--invert-grep
       limit commits output ones log message not match pattern specified --grep=<pattern>.

(incidentally, note release/x.x.x.x ^master can spelled master..release/x.x.x.x. there's no machine-level reason prefer 1 on other—both wind doing same thing internally—so use whichever find more readable.)


Comments

Post a Comment

Popular posts from this blog

aws api gateway - SerializationException in posting new Records via Dynamodb Proxy Service in API -

i getting "__type": "com.amazon.coral.service#serializationexception" as reply in postman & in test console in api gateway trying post record directly dynamodb using api proxy services.. referring aws article - https://aws.amazon.com/blogs/compute/using-amazon-api-gateway-as-a-proxy-for-dynamodb/ here's mapping { "tablename": "tablenamegoeshere", "item": { "id" : "$context.requestid" "eventname" : "$input.path('$.eventname')", "timestamp" : $input.path('$.timestamp'), "answers": "$util.parsejson($input.path('$.answers'))" } } update: did asked ... , worked if try add array of json objects gives me above same error - here's trying now. please - couldnt find on google well #set($inputroot = $input.path('$')) { "tablename": "answer", "item": {
Read more

asp.net - Problems sending emails from forum -

i have been redesigning site has message board, has been written guy looked after site. it has few problems , written in .asp , uses .mdb files database. you can see whole thing here . feel free post if helps, test thing have set using original files , new database. the basic problem when posts message, supposed email sent them, have posted it. when replies, originator supposed message, replier has been posted. i’d have thought @ point in process there should script/file in postmessage.asp? the postmessage.asp page below. <% option explicit %> <!-- #include virtual="common/adovbs.inc" --> <html> <head> <meta http-equiv="content-type" content="text/html; charset=windows-1252"> <meta name="generator" content="microsoft frontpage 4.0"> <meta name="progid" content="frontpage.editor.document"> <title>new page 2</title> <base target="_self"
Read more