How to retrieve branch names in a custom Git merge driver? -



How to retrieve branch names in a custom Git merge driver? -

i'm writing custom merge driver needs aware of names of branches merging. managed retrieve name of branch beingness merged (destination) git symbolic-ref head , name of branch beingness merged in (source) githead_<sha> environment variable.

# retrieve merged branch name env var githead_<sha>=<branchname> # cannot utilize sym ref of merge_head, doesn't yet exist githead=$(env | grep githead) # e.g. githead_<sha>=release/1.43 # cutting out lastly "=" sign source="${githead##*=}" # retrieve base of operations branch name sym ref of head branch=$(git symbolic-ref head) # e.g. refs/heads/master # cutting out "refs/heads" destination="${branch#refs/heads/}" echo "merging $source $destination"

is right way of doing this? particularly, retrieving source name environment variable seems flaky. note merge_head not nowadays @ point, cannot utilize same approach head.

git git-merge

Comments

Post a Comment

Popular posts from this blog

php - Android app custom user registration and login with cookie using facebook sdk -

php - Android app custom user registration and login with cookie using facebook sdk - i developing android application in users need register , log in using facebook. approximately, flow. open app first time, authenticate facebook, data, send info server create them business relationship in application, start session new business relationship in server, cookie perform later interactions. so far good. what need know wich info have send server, can able identify users when log in seccond time. because need start session in server , send cookie android app farther interactions. i'm using php server side language. i thinking getting getaccesstoken() in android facebook sdk, pass server on business relationship creation , storing in android app. but can't manage how login users on sec time utilize app. any suggestions ? in advance ! to uniquely identify user within app, should create request /me , user's id. guaranteed unique , remain con...
Read more

c# - Create a Notification Object (Email or Page) At Run Time -- Dependency Injection or Factory -

c# - Create a Notification Object (Email or Page) At Run Time -- Dependency Injection or Factory - i have code emails me notification when happens. trying add together page , also remove dependency on email. for reference; have name of notification want send stored string in database. @ runtime have list of people , string representation of want receive. i thought dependency injection ninject, kernel bindings got big , seemed hacking together. then thought simple factory, activator.createinstance(email/page) inotifcation, don't know how handle differing constructor parameters (unless utilize common, complex property, employee, has info need). so far have this: public interface inotification { void sendmessage(); } public class email: inotification { private readonly string _toemailaddress; private string body { { homecoming "email"; } } private static string smtphost { ...
Read more

Set Up Of Common Name Of SSL Certificate To Protect Plesk Panel -

Set Up Of Common Name Of SSL Certificate To Protect Plesk Panel - a pci compliance scanner balking self signed ssl certificate protecting secure access plesk panel contains name mismatch between location of plesk panel , name on certificate, namely self-signed cert's name "parallels" , domain reach plesk 'ip address:8443'. so figured go ahead , free ssl certificate seek fiddle error. when generated certificate used server domain name site name when generated certificate. if visit 'domain name:8443' fine, no ssl warning. if visit 'ip address:8443' (which believe scanner does) certificate name mismatch error, digicert's ssl checker says certificate name should ip address. can generate certificate mutual name ip address? tempted should pci scanner accepts, right mutual name use? run issue before? you can seek subject alternative name extension ip address. also, can maintain "parallels" mutual name, , add together ...
Read more