git - Get source branch name in commit-msg hook of merge commit -


in commit-msg hook merge commit, how can branch name of immediate source branch merge? can target branch like

git rev-parse --abbrev-ref head

but head , head^ both refer target branch. there way programmatically determine source? i'm using bash script hook.

the default merge commit message contains text:

merge branch 'source-branch' target-branch

so commit-msg hook grab name right out of message, there's no guarantee user hasn't edited it. if there's more foolproof method, prefer it.

edit: ah, unfortunately didn't realize commit-msg doesn't run on merge commits! i'll have find different way want anyway.

this give commit being merged:

git rev-parse merge_head

i not think there way find branch name other guessing command like:

git for-each-ref | grep ^$(git rev-parse merge_head)

(which finds branches pointing commit merging)

note commit being merged not have to branch, 1 can merge commit directly git merge deadbeef.

in case of octopus merge, there more 1 commit being merged @ same time, , merge_head not present.

if extract merge message, using .git/merge_msg safer .git/commit_editmsg, since less hand-edited.

the message generated git merge, hence has access branch name git merge's arguments, not seem stored on disk.


Comments

Post a Comment

Popular posts from this blog

php - failed to open stream: HTTP request failed! HTTP/1.0 400 Bad Request -

this code i'm using find latitude , longitude of place: function coords($address){ echo $url="http://maps.googleapis.com/maps/api/geocode/json?address=".$address; $json = file_get_contents(urlencode($url)); $data = json_decode($json, true); print_r($data['results'][0]['geometry']['location']['lat']); print_r($data['results'][0]['geometry']['location']['lng']); } however returns warning: failed open stream: http request failed! http/1.0 400 bad request if use above code in simple procedure works fine not in function. note: have tried curl_init()... method produced same result? instead of encoding whole url encode address part. following code work fine $add='jamshoro phase 2'; $url="http://maps.googleapis.com/maps/api/geocode/json?address=".urlencode($add); $json = file_get_contents($url); $data = json_decode($json, true); print_r($data['r...
Read more

command line - Use qwinsta in PowerShell ISE -

i trying use qwinsta , rwinsta powershell code. when try run error "the term 'qwinsta' not recognized name of cmdlet, function, script file, or operable program." need able remotely on several machines without having add .dll's or modules other machines. tried terminal services powershell module, need able put on remote machines , not able that. within powershell ise how run qwinsta? not looking parse information gather it. following code have tried (which had found on site also): function get-tssessions { param( $computername = "localhost" ) qwinsta /server:$computername | #parse output foreach-object { $_.trim() -replace "\s+","," } | #convert objects convertfrom-csv } get-tssessions -computername "localhost" | ft -autosize best have running powershell ise (x86). when run command qwinsta there same error you. of course assuming have 64-bit os. th...
Read more

java - Incorrect order of records in M-M relationship in hibernate -

Image
i have 4 records in bridge table in mysql database. using @manytomany in hibernate, accurate order of employees incorrect incorrect of projects. following required material figure out doing mistake. this source. @entity @table(name="project") public class projectbean { @id @generatedvalue @column(name="project_id") private int projectid; @column(name="title") private string projecttitle; @manytomany(mappedby="projects") private collection<employeebean> employees; public projectbean() { employees = new arraylist<employeebean>(); } //getters & setters } @entity @table(name="employee") public class employeebean { @id @generatedvalue @column(name="employee_id") private int employee_id; @column(name="first_name") private string ...
Read more