github - GIT HOOK to check keyword "PROMOTE" in message when GIT MERGE is executed -

-

i need check "promote" keyword in message whenever there merge master , other branch

eg: if git command is:
git merge -m "merge commit 1 branch1 master" f145cd536463e595f1e4306eeec6f92a9cd6c734 merge should exit error "promote key word not set in merge message"

git merge -m "promote commit 1 branch1 master" f145cd536463e595f1e4306eeec6f92a9cd6c734 merge should successful.

the problem merge command is not guaranteed create commit unless use --no-ff. example might following result command. 

git merge  -m "merge commit 1  branch1 master" updating f145cd5..cd6c734 fast-forward (no commit created; -m option ignored)

see post , pdf great explanation of fast-forward vs no fast-forward when merging. people think -no-ff muddies history , breaks git-bisect , git blame. others love --no-ff because allows merge comments , visualization of happened in feature branch.

if decide use --no-ff, can configure git to --no-ff globally or on per branch basis. use command configure --no-ff on master only.

git config branch.master.mergeoptions  "--no-ff"

let's original problem.

git supports hooks can used verification , work flow. hooks can run @ local client or server developers push changes. regular expression using client hook commit-msg, one, seems perfect. git does not have pre-merge hook use reject merge. see here list of hooks , triggering commands. worse notice git merge not trigger of hooks if force commit --no-ff.

so have 2 choices. same mentioned in post explores topic further no better solutions.

  • put update hook, one, on git server developers pushing. problem approach doesn't keep them making bad comments. approach keeps bad comments off server. developers have lot of work in fixing history before can push server if don't right first time.
  • write (and distribute, , maintain...) git-merge wrapper control @ local repo level. michael j gruber has pre-merge hook in git fork here.

Comments

Post a Comment

Popular posts from this blog

javascript - gulp-nodemon - nodejs restart after file change - Error: listen EADDRINUSE events.js:85 -

-
i'm running nodejs 0.12.3 - gulp 3.10.8 , gulp-nodemon 2.0.3. gulpfile.js : gulp.task('serve', ['build'], function() { gulp.start('fb-flo'); nodemon({ script: paths.server, env: { 'node_env': 'development' }, // env: { 'node_env': 'production' }, execmap: { 'js': 'node_modules/babel/bin/babel-node --stage 1' //es7 cote server }, delay: '0ms', watch: ['src/shared/', 'src/server/'], ignore: ['src/shared/components'], tasks: function (changedfiles) { var tasks = []; changedfiles.foreach(function (file) { if (path.extname(file) === '.jsx' && !~tasks.indexof('bundlejs')) tasks.push('bundlejs'); if (path.extname(file) === '.less' && !~tasks.indexof('compileless')) tasks.push('compileless'); }); return tasks; } ...
Read more

Fatal Python error: Py_Initialize: unable to load the file system codec. ImportError: No module named 'encodings' -

-
i trying make simple python program opening list of webpages user manually download reports site. don't have previous experience preparing exe files.. , i'm in learning process python coding. of done on windows 7 x64 this python code: #!c:/python34/python.exe -u splinter import * import time import os import csv #---------------------------------- raporty = [] open('../raporty.csv', newline='') csvfile: contents = csv.reader(csvfile, delimiter=' ', quotechar='|') row in contents: r = ', '.join(row) r = r.replace(',','') raporty.append(r) #--not implemented yet zmienne = [] open('../zmienne.csv', newline='') csvfile: contents = csv.reader(csvfile, delimiter=' ', quotechar='|') row in contents: r = ', '.join(row) r = r.replace(',','') zmienne.append(r) print("start") browser = browser(...
Read more

javascript - oscilloscope of speaker input stops rendering after a few seconds -

-
the following script reads audio user's microphone , renders oscilloscope on html canvas. the source taken example of mozilla developer network: visualizations web audio api and here fiddle: http://jsfiddle.net/b7j8pktp/ mozgetusermedia (note: code has no fork mechanism different browsers: works firefox) it works fine few seconds , stops rendering. whereas works totally stable: http://mdn.github.io/voice-change-o-matic/ the problem can reduced following code. microphone activation icon (next the address bar in firefox) disappears after 5 seconds: navigator.mozgetusermedia({audio: true}, function() {}, function() {} ); ( http://jsfiddle.net/b7j8pktp/2/ ) this known bug in firefox. take stream getusermedia call , hook window so: navigator.mozgetusermedia({audio: true}, function(stream) { window.stream = stream; // rest of code }, function err() { // handle error }); hopefully can fixed soon. problem we're f...
Read more