123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994995996997998999100010011002100310041005100610071008100910101011101210131014101510161017101810191020102110221023102410251026102710281029103010311032103310341035103610371038103910401041104210431044104510461047104810491050105110521053105410551056105710581059106010611062106310641065106610671068106910701071107210731074107510761077107810791080108110821083108410851086108710881089109010911092109310941095109610971098109911001101110211031104110511061107110811091110111111121113111411151116111711181119112011211122112311241125112611271128112911301131113211331134113511361137113811391140114111421143114411451146114711481149115011511152115311541155115611571158115911601161116211631164116511661167116811691170117111721173117411751176117711781179118011811182118311841185118611871188118911901191119211931194119511961197119811991200120112021203120412051206120712081209121012111212121312141215121612171218121912201221122212231224122512261227122812291230123112321233123412351236123712381239124012411242124312441245124612471248124912501251125212531254125512561257125812591260126112621263126412651266126712681269127012711272127312741275127612771278127912801281128212831284128512861287128812891290129112921293129412951296129712981299130013011302130313041305130613071308130913101311131213131314131513161317131813191320132113221323132413251326132713281329133013311332133313341335133613371338133913401341134213431344134513461347134813491350135113521353135413551356135713581359136013611362136313641365136613671368136913701371137213731374137513761377137813791380138113821383138413851386138713881389139013911392139313941395139613971398139914001401140214031404140514061407140814091410141114121413141414151416141714181419142014211422142314241425142614271428142914301431143214331434143514361437143814391440144114421443144414451446144714481449145014511452145314541455145614571458145914601461146214631464146514661467146814691470147114721473147414751476147714781479148014811482148314841485148614871488148914901491149214931494149514961497149814991500150115021503150415051506150715081509151015111512151315141515151615171518151915201521152215231524152515261527152815291530153115321533153415351536153715381539154015411542154315441545154615471548154915501551155215531554155515561557155815591560156115621563156415651566156715681569157015711572157315741575157615771578157915801581158215831584158515861587158815891590159115921593159415951596159715981599160016011602160316041605160616071608160916101611161216131614161516161617161816191620162116221623162416251626162716281629163016311632163316341635163616371638163916401641164216431644164516461647164816491650165116521653165416551656165716581659166016611662166316641665166616671668166916701671167216731674167516761677167816791680168116821683168416851686168716881689169016911692169316941695169616971698169917001701170217031704170517061707170817091710171117121713171417151716171717181719172017211722172317241725172617271728172917301731173217331734173517361737173817391740174117421743174417451746174717481749175017511752175317541755175617571758175917601761176217631764176517661767176817691770177117721773177417751776177717781779178017811782178317841785178617871788178917901791179217931794179517961797179817991800180118021803180418051806180718081809181018111812181318141815181618171818181918201821182218231824182518261827182818291830183118321833183418351836183718381839184018411842184318441845184618471848184918501851185218531854185518561857185818591860186118621863186418651866186718681869187018711872187318741875187618771878187918801881188218831884188518861887188818891890189118921893189418951896189718981899190019011902190319041905190619071908190919101911191219131914191519161917191819191920192119221923192419251926192719281929193019311932193319341935193619371938193919401941194219431944194519461947194819491950195119521953195419551956195719581959196019611962196319641965196619671968196919701971197219731974197519761977197819791980198119821983198419851986198719881989199019911992199319941995199619971998199920002001200220032004200520062007200820092010201120122013201420152016201720182019202020212022202320242025202620272028202920302031203220332034203520362037203820392040204120422043204420452046204720482049205020512052205320542055205620572058205920602061206220632064206520662067206820692070207120722073207420752076207720782079208020812082208320842085208620872088208920902091209220932094209520962097209820992100210121022103210421052106210721082109211021112112211321142115211621172118211921202121212221232124212521262127212821292130213121322133213421352136213721382139214021412142214321442145214621472148214921502151215221532154215521562157215821592160216121622163216421652166216721682169217021712172217321742175217621772178217921802181218221832184218521862187218821892190219121922193219421952196219721982199220022012202220322042205220622072208220922102211221222132214221522162217221822192220222122222223222422252226222722282229223022312232223322342235223622372238223922402241224222432244224522462247224822492250225122522253225422552256225722582259226022612262226322642265226622672268226922702271227222732274227522762277227822792280228122822283228422852286228722882289229022912292229322942295229622972298229923002301230223032304230523062307230823092310231123122313231423152316231723182319232023212322232323242325232623272328232923302331233223332334233523362337233823392340234123422343234423452346234723482349235023512352235323542355235623572358235923602361236223632364236523662367236823692370237123722373237423752376237723782379238023812382238323842385238623872388238923902391239223932394239523962397239823992400240124022403240424052406240724082409241024112412241324142415241624172418241924202421242224232424242524262427242824292430243124322433243424352436243724382439244024412442244324442445244624472448244924502451245224532454245524562457245824592460246124622463246424652466246724682469247024712472247324742475247624772478247924802481248224832484248524862487248824892490249124922493249424952496249724982499250025012502250325042505250625072508250925102511251225132514251525162517251825192520252125222523252425252526252725282529253025312532253325342535253625372538253925402541254225432544254525462547254825492550255125522553255425552556255725582559256025612562256325642565256625672568256925702571257225732574257525762577257825792580258125822583258425852586258725882589259025912592259325942595259625972598259926002601260226032604260526062607260826092610261126122613261426152616261726182619262026212622262326242625262626272628262926302631263226332634263526362637263826392640264126422643264426452646264726482649265026512652265326542655265626572658265926602661266226632664266526662667266826692670267126722673267426752676267726782679268026812682268326842685268626872688268926902691269226932694269526962697269826992700270127022703270427052706270727082709271027112712271327142715271627172718271927202721272227232724272527262727272827292730273127322733273427352736273727382739274027412742274327442745274627472748274927502751275227532754275527562757275827592760276127622763276427652766276727682769277027712772277327742775277627772778277927802781278227832784278527862787278827892790279127922793279427952796279727982799280028012802280328042805280628072808280928102811281228132814281528162817281828192820282128222823282428252826282728282829283028312832283328342835283628372838283928402841284228432844284528462847284828492850285128522853285428552856285728582859286028612862286328642865286628672868286928702871287228732874287528762877287828792880288128822883288428852886288728882889289028912892289328942895289628972898289929002901290229032904290529062907290829092910291129122913291429152916291729182919292029212922292329242925292629272928292929302931293229332934293529362937293829392940294129422943294429452946294729482949295029512952295329542955295629572958295929602961296229632964296529662967296829692970297129722973297429752976297729782979298029812982298329842985298629872988298929902991299229932994299529962997299829993000300130023003300430053006300730083009301030113012301330143015301630173018301930203021302230233024302530263027302830293030303130323033303430353036303730383039304030413042304330443045304630473048304930503051305230533054305530563057305830593060306130623063306430653066306730683069307030713072307330743075307630773078307930803081308230833084308530863087308830893090309130923093309430953096309730983099310031013102310331043105310631073108310931103111311231133114311531163117311831193120312131223123312431253126312731283129313031313132313331343135313631373138313931403141314231433144314531463147314831493150315131523153315431553156315731583159316031613162316331643165316631673168316931703171317231733174317531763177317831793180318131823183318431853186318731883189319031913192319331943195 |
- diff -Nuar efitools-1.7.0.orig/.git/config efitools-1.7.0/.git/config
- --- efitools-1.7.0.orig/.git/config 1970-01-01 02:00:00.000000000 +0200
- +++ efitools-1.7.0/.git/config 2017-12-16 21:05:59.880107278 +0300
- @@ -0,0 +1,11 @@
- +[core]
- + repositoryformatversion = 0
- + filemode = true
- + bare = false
- + logallrefupdates = true
- +[remote "origin"]
- + url = https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git
- + fetch = +refs/heads/*:refs/remotes/origin/*
- +[branch "master"]
- + remote = origin
- + merge = refs/heads/master
- diff -Nuar efitools-1.7.0.orig/.git/description efitools-1.7.0/.git/description
- --- efitools-1.7.0.orig/.git/description 1970-01-01 02:00:00.000000000 +0200
- +++ efitools-1.7.0/.git/description 2017-12-16 21:05:59.879107278 +0300
- @@ -0,0 +1 @@
- +Unnamed repository; edit this file 'description' to name the repository.
- diff -Nuar efitools-1.7.0.orig/.git/FETCH_HEAD efitools-1.7.0/.git/FETCH_HEAD
- --- efitools-1.7.0.orig/.git/FETCH_HEAD 1970-01-01 02:00:00.000000000 +0200
- +++ efitools-1.7.0/.git/FETCH_HEAD 2017-12-16 21:05:59.879107278 +0300
- @@ -0,0 +1 @@
- +0649468475d20d8ca5634433c4912467cef3ce93 branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools
- diff -Nuar efitools-1.7.0.orig/.git/HEAD efitools-1.7.0/.git/HEAD
- --- efitools-1.7.0.orig/.git/HEAD 1970-01-01 02:00:00.000000000 +0200
- +++ efitools-1.7.0/.git/HEAD 2017-12-16 21:05:59.881107278 +0300
- @@ -0,0 +1 @@
- +ref: refs/heads/master
- diff -Nuar efitools-1.7.0.orig/.git/hooks/applypatch-msg.sample efitools-1.7.0/.git/hooks/applypatch-msg.sample
- --- efitools-1.7.0.orig/.git/hooks/applypatch-msg.sample 1970-01-01 02:00:00.000000000 +0200
- +++ efitools-1.7.0/.git/hooks/applypatch-msg.sample 2017-12-16 21:05:59.880107278 +0300
- @@ -0,0 +1,15 @@
- +#!/bin/sh
- +#
- +# An example hook script to check the commit log message taken by
- +# applypatch from an e-mail message.
- +#
- +# The hook should exit with non-zero status after issuing an
- +# appropriate message if it wants to stop the commit. The hook is
- +# allowed to edit the commit message file.
- +#
- +# To enable this hook, rename this file to "applypatch-msg".
- +
- +. git-sh-setup
- +commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
- +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
- +:
- diff -Nuar efitools-1.7.0.orig/.git/hooks/commit-msg.sample efitools-1.7.0/.git/hooks/commit-msg.sample
- --- efitools-1.7.0.orig/.git/hooks/commit-msg.sample 1970-01-01 02:00:00.000000000 +0200
- +++ efitools-1.7.0/.git/hooks/commit-msg.sample 2017-12-16 21:05:59.879107278 +0300
- @@ -0,0 +1,24 @@
- +#!/bin/sh
- +#
- +# An example hook script to check the commit log message.
- +# Called by "git commit" with one argument, the name of the file
- +# that has the commit message. The hook should exit with non-zero
- +# status after issuing an appropriate message if it wants to stop the
- +# commit. The hook is allowed to edit the commit message file.
- +#
- +# To enable this hook, rename this file to "commit-msg".
- +
- +# Uncomment the below to add a Signed-off-by line to the message.
- +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
- +# hook is more suited to it.
- +#
- +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
- +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
- +
- +# This example catches duplicate Signed-off-by lines.
- +
- +test "" = "$(grep '^Signed-off-by: ' "$1" |
- + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
- + echo >&2 Duplicate Signed-off-by lines.
- + exit 1
- +}
- diff -Nuar efitools-1.7.0.orig/.git/hooks/post-update.sample efitools-1.7.0/.git/hooks/post-update.sample
- --- efitools-1.7.0.orig/.git/hooks/post-update.sample 1970-01-01 02:00:00.000000000 +0200
- +++ efitools-1.7.0/.git/hooks/post-update.sample 2017-12-16 21:05:59.879107278 +0300
- @@ -0,0 +1,8 @@
- +#!/bin/sh
- +#
- +# An example hook script to prepare a packed repository for use over
- +# dumb transports.
- +#
- +# To enable this hook, rename this file to "post-update".
- +
- +exec git update-server-info
- diff -Nuar efitools-1.7.0.orig/.git/hooks/pre-applypatch.sample efitools-1.7.0/.git/hooks/pre-applypatch.sample
- --- efitools-1.7.0.orig/.git/hooks/pre-applypatch.sample 1970-01-01 02:00:00.000000000 +0200
- +++ efitools-1.7.0/.git/hooks/pre-applypatch.sample 2017-12-16 21:05:59.880107278 +0300
- @@ -0,0 +1,14 @@
- +#!/bin/sh
- +#
- +# An example hook script to verify what is about to be committed
- +# by applypatch from an e-mail message.
- +#
- +# The hook should exit with non-zero status after issuing an
- +# appropriate message if it wants to stop the commit.
- +#
- +# To enable this hook, rename this file to "pre-applypatch".
- +
- +. git-sh-setup
- +precommit="$(git rev-parse --git-path hooks/pre-commit)"
- +test -x "$precommit" && exec "$precommit" ${1+"$@"}
- +:
- diff -Nuar efitools-1.7.0.orig/.git/hooks/pre-commit.sample efitools-1.7.0/.git/hooks/pre-commit.sample
- --- efitools-1.7.0.orig/.git/hooks/pre-commit.sample 1970-01-01 02:00:00.000000000 +0200
- +++ efitools-1.7.0/.git/hooks/pre-commit.sample 2017-12-16 21:05:59.880107278 +0300
- @@ -0,0 +1,49 @@
- +#!/bin/sh
- +#
- +# An example hook script to verify what is about to be committed.
- +# Called by "git commit" with no arguments. The hook should
- +# exit with non-zero status after issuing an appropriate message if
- +# it wants to stop the commit.
- +#
- +# To enable this hook, rename this file to "pre-commit".
- +
- +if git rev-parse --verify HEAD >/dev/null 2>&1
- +then
- + against=HEAD
- +else
- + # Initial commit: diff against an empty tree object
- + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
- +fi
- +
- +# If you want to allow non-ASCII filenames set this variable to true.
- +allownonascii=$(git config --bool hooks.allownonascii)
- +
- +# Redirect output to stderr.
- +exec 1>&2
- +
- +# Cross platform projects tend to avoid non-ASCII filenames; prevent
- +# them from being added to the repository. We exploit the fact that the
- +# printable range starts at the space character and ends with tilde.
- +if [ "$allownonascii" != "true" ] &&
- + # Note that the use of brackets around a tr range is ok here, (it's
- + # even required, for portability to Solaris 10's /usr/bin/tr), since
- + # the square bracket bytes happen to fall in the designated range.
- + test $(git diff --cached --name-only --diff-filter=A -z $against |
- + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
- +then
- + cat <<\EOF
- +Error: Attempt to add a non-ASCII file name.
- +
- +This can cause problems if you want to work with people on other platforms.
- +
- +To be portable it is advisable to rename the file.
- +
- +If you know what you are doing you can disable this check using:
- +
- + git config hooks.allownonascii true
- +EOF
- + exit 1
- +fi
- +
- +# If there are whitespace errors, print the offending file names and fail.
- +exec git diff-index --check --cached $against --
- diff -Nuar efitools-1.7.0.orig/.git/hooks/prepare-commit-msg.sample efitools-1.7.0/.git/hooks/prepare-commit-msg.sample
- --- efitools-1.7.0.orig/.git/hooks/prepare-commit-msg.sample 1970-01-01 02:00:00.000000000 +0200
- +++ efitools-1.7.0/.git/hooks/prepare-commit-msg.sample 2017-12-16 21:05:59.879107278 +0300
- @@ -0,0 +1,36 @@
- +#!/bin/sh
- +#
- +# An example hook script to prepare the commit log message.
- +# Called by "git commit" with the name of the file that has the
- +# commit message, followed by the description of the commit
- +# message's source. The hook's purpose is to edit the commit
- +# message file. If the hook fails with a non-zero status,
- +# the commit is aborted.
- +#
- +# To enable this hook, rename this file to "prepare-commit-msg".
- +
- +# This hook includes three examples. The first comments out the
- +# "Conflicts:" part of a merge commit.
- +#
- +# The second includes the output of "git diff --name-status -r"
- +# into the message, just before the "git status" output. It is
- +# commented because it doesn't cope with --amend or with squashed
- +# commits.
- +#
- +# The third example adds a Signed-off-by line to the message, that can
- +# still be edited. This is rarely a good idea.
- +
- +case "$2,$3" in
- + merge,)
- + /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
- +
- +# ,|template,)
- +# /usr/bin/perl -i.bak -pe '
- +# print "\n" . `git diff --cached --name-status -r`
- +# if /^#/ && $first++ == 0' "$1" ;;
- +
- + *) ;;
- +esac
- +
- +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
- +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
- diff -Nuar efitools-1.7.0.orig/.git/hooks/pre-push.sample efitools-1.7.0/.git/hooks/pre-push.sample
- --- efitools-1.7.0.orig/.git/hooks/pre-push.sample 1970-01-01 02:00:00.000000000 +0200
- +++ efitools-1.7.0/.git/hooks/pre-push.sample 2017-12-16 21:05:59.880107278 +0300
- @@ -0,0 +1,53 @@
- +#!/bin/sh
- +
- +# An example hook script to verify what is about to be pushed. Called by "git
- +# push" after it has checked the remote status, but before anything has been
- +# pushed. If this script exits with a non-zero status nothing will be pushed.
- +#
- +# This hook is called with the following parameters:
- +#
- +# $1 -- Name of the remote to which the push is being done
- +# $2 -- URL to which the push is being done
- +#
- +# If pushing without using a named remote those arguments will be equal.
- +#
- +# Information about the commits which are being pushed is supplied as lines to
- +# the standard input in the form:
- +#
- +# <local ref> <local sha1> <remote ref> <remote sha1>
- +#
- +# This sample shows how to prevent push of commits where the log message starts
- +# with "WIP" (work in progress).
- +
- +remote="$1"
- +url="$2"
- +
- +z40=0000000000000000000000000000000000000000
- +
- +while read local_ref local_sha remote_ref remote_sha
- +do
- + if [ "$local_sha" = $z40 ]
- + then
- + # Handle delete
- + :
- + else
- + if [ "$remote_sha" = $z40 ]
- + then
- + # New branch, examine all commits
- + range="$local_sha"
- + else
- + # Update to existing branch, examine new commits
- + range="$remote_sha..$local_sha"
- + fi
- +
- + # Check for WIP commit
- + commit=`git rev-list -n 1 --grep '^WIP' "$range"`
- + if [ -n "$commit" ]
- + then
- + echo >&2 "Found WIP commit in $local_ref, not pushing"
- + exit 1
- + fi
- + fi
- +done
- +
- +exit 0
- diff -Nuar efitools-1.7.0.orig/.git/hooks/pre-rebase.sample efitools-1.7.0/.git/hooks/pre-rebase.sample
- --- efitools-1.7.0.orig/.git/hooks/pre-rebase.sample 1970-01-01 02:00:00.000000000 +0200
- +++ efitools-1.7.0/.git/hooks/pre-rebase.sample 2017-12-16 21:05:59.879107278 +0300
- @@ -0,0 +1,169 @@
- +#!/bin/sh
- +#
- +# Copyright (c) 2006, 2008 Junio C Hamano
- +#
- +# The "pre-rebase" hook is run just before "git rebase" starts doing
- +# its job, and can prevent the command from running by exiting with
- +# non-zero status.
- +#
- +# The hook is called with the following parameters:
- +#
- +# $1 -- the upstream the series was forked from.
- +# $2 -- the branch being rebased (or empty when rebasing the current branch).
- +#
- +# This sample shows how to prevent topic branches that are already
- +# merged to 'next' branch from getting rebased, because allowing it
- +# would result in rebasing already published history.
- +
- +publish=next
- +basebranch="$1"
- +if test "$#" = 2
- +then
- + topic="refs/heads/$2"
- +else
- + topic=`git symbolic-ref HEAD` ||
- + exit 0 ;# we do not interrupt rebasing detached HEAD
- +fi
- +
- +case "$topic" in
- +refs/heads/??/*)
- + ;;
- +*)
- + exit 0 ;# we do not interrupt others.
- + ;;
- +esac
- +
- +# Now we are dealing with a topic branch being rebased
- +# on top of master. Is it OK to rebase it?
- +
- +# Does the topic really exist?
- +git show-ref -q "$topic" || {
- + echo >&2 "No such branch $topic"
- + exit 1
- +}
- +
- +# Is topic fully merged to master?
- +not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
- +if test -z "$not_in_master"
- +then
- + echo >&2 "$topic is fully merged to master; better remove it."
- + exit 1 ;# we could allow it, but there is no point.
- +fi
- +
- +# Is topic ever merged to next? If so you should not be rebasing it.
- +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
- +only_next_2=`git rev-list ^master ${publish} | sort`
- +if test "$only_next_1" = "$only_next_2"
- +then
- + not_in_topic=`git rev-list "^$topic" master`
- + if test -z "$not_in_topic"
- + then
- + echo >&2 "$topic is already up-to-date with master"
- + exit 1 ;# we could allow it, but there is no point.
- + else
- + exit 0
- + fi
- +else
- + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
- + /usr/bin/perl -e '
- + my $topic = $ARGV[0];
- + my $msg = "* $topic has commits already merged to public branch:\n";
- + my (%not_in_next) = map {
- + /^([0-9a-f]+) /;
- + ($1 => 1);
- + } split(/\n/, $ARGV[1]);
- + for my $elem (map {
- + /^([0-9a-f]+) (.*)$/;
- + [$1 => $2];
- + } split(/\n/, $ARGV[2])) {
- + if (!exists $not_in_next{$elem->[0]}) {
- + if ($msg) {
- + print STDERR $msg;
- + undef $msg;
- + }
- + print STDERR " $elem->[1]\n";
- + }
- + }
- + ' "$topic" "$not_in_next" "$not_in_master"
- + exit 1
- +fi
- +
- +exit 0
- +
- +################################################################
- +
- +This sample hook safeguards topic branches that have been
- +published from being rewound.
- +
- +The workflow assumed here is:
- +
- + * Once a topic branch forks from "master", "master" is never
- + merged into it again (either directly or indirectly).
- +
- + * Once a topic branch is fully cooked and merged into "master",
- + it is deleted. If you need to build on top of it to correct
- + earlier mistakes, a new topic branch is created by forking at
- + the tip of the "master". This is not strictly necessary, but
- + it makes it easier to keep your history simple.
- +
- + * Whenever you need to test or publish your changes to topic
- + branches, merge them into "next" branch.
- +
- +The script, being an example, hardcodes the publish branch name
- +to be "next", but it is trivial to make it configurable via
- +$GIT_DIR/config mechanism.
- +
- +With this workflow, you would want to know:
- +
- +(1) ... if a topic branch has ever been merged to "next". Young
- + topic branches can have stupid mistakes you would rather
- + clean up before publishing, and things that have not been
- + merged into other branches can be easily rebased without
- + affecting other people. But once it is published, you would
- + not want to rewind it.
- +
- +(2) ... if a topic branch has been fully merged to "master".
- + Then you can delete it. More importantly, you should not
- + build on top of it -- other people may already want to
- + change things related to the topic as patches against your
- + "master", so if you need further changes, it is better to
- + fork the topic (perhaps with the same name) afresh from the
- + tip of "master".
- +
- +Let's look at this example:
- +
- + o---o---o---o---o---o---o---o---o---o "next"
- + / / / /
- + / a---a---b A / /
- + / / / /
- + / / c---c---c---c B /
- + / / / \ /
- + / / / b---b C \ /
- + / / / / \ /
- + ---o---o---o---o---o---o---o---o---o---o---o "master"
- +
- +
- +A, B and C are topic branches.
- +
- + * A has one fix since it was merged up to "next".
- +
- + * B has finished. It has been fully merged up to "master" and "next",
- + and is ready to be deleted.
- +
- + * C has not merged to "next" at all.
- +
- +We would want to allow C to be rebased, refuse A, and encourage
- +B to be deleted.
- +
- +To compute (1):
- +
- + git rev-list ^master ^topic next
- + git rev-list ^master next
- +
- + if these match, topic has not merged in next at all.
- +
- +To compute (2):
- +
- + git rev-list master..topic
- +
- + if this is empty, it is fully merged to "master".
- diff -Nuar efitools-1.7.0.orig/.git/hooks/pre-receive.sample efitools-1.7.0/.git/hooks/pre-receive.sample
- --- efitools-1.7.0.orig/.git/hooks/pre-receive.sample 1970-01-01 02:00:00.000000000 +0200
- +++ efitools-1.7.0/.git/hooks/pre-receive.sample 2017-12-16 21:05:59.880107278 +0300
- @@ -0,0 +1,24 @@
- +#!/bin/sh
- +#
- +# An example hook script to make use of push options.
- +# The example simply echoes all push options that start with 'echoback='
- +# and rejects all pushes when the "reject" push option is used.
- +#
- +# To enable this hook, rename this file to "pre-receive".
- +
- +if test -n "$GIT_PUSH_OPTION_COUNT"
- +then
- + i=0
- + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
- + do
- + eval "value=\$GIT_PUSH_OPTION_$i"
- + case "$value" in
- + echoback=*)
- + echo "echo from the pre-receive-hook: ${value#*=}" >&2
- + ;;
- + reject)
- + exit 1
- + esac
- + i=$((i + 1))
- + done
- +fi
- diff -Nuar efitools-1.7.0.orig/.git/hooks/update.sample efitools-1.7.0/.git/hooks/update.sample
- --- efitools-1.7.0.orig/.git/hooks/update.sample 1970-01-01 02:00:00.000000000 +0200
- +++ efitools-1.7.0/.git/hooks/update.sample 2017-12-16 21:05:59.880107278 +0300
- @@ -0,0 +1,128 @@
- +#!/bin/sh
- +#
- +# An example hook script to block unannotated tags from entering.
- +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
- +#
- +# To enable this hook, rename this file to "update".
- +#
- +# Config
- +# ------
- +# hooks.allowunannotated
- +# This boolean sets whether unannotated tags will be allowed into the
- +# repository. By default they won't be.
- +# hooks.allowdeletetag
- +# This boolean sets whether deleting tags will be allowed in the
- +# repository. By default they won't be.
- +# hooks.allowmodifytag
- +# This boolean sets whether a tag may be modified after creation. By default
- +# it won't be.
- +# hooks.allowdeletebranch
- +# This boolean sets whether deleting branches will be allowed in the
- +# repository. By default they won't be.
- +# hooks.denycreatebranch
- +# This boolean sets whether remotely creating branches will be denied
- +# in the repository. By default this is allowed.
- +#
- +
- +# --- Command line
- +refname="$1"
- +oldrev="$2"
- +newrev="$3"
- +
- +# --- Safety check
- +if [ -z "$GIT_DIR" ]; then
- + echo "Don't run this script from the command line." >&2
- + echo " (if you want, you could supply GIT_DIR then run" >&2
- + echo " $0 <ref> <oldrev> <newrev>)" >&2
- + exit 1
- +fi
- +
- +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
- + echo "usage: $0 <ref> <oldrev> <newrev>" >&2
- + exit 1
- +fi
- +
- +# --- Config
- +allowunannotated=$(git config --bool hooks.allowunannotated)
- +allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
- +denycreatebranch=$(git config --bool hooks.denycreatebranch)
- +allowdeletetag=$(git config --bool hooks.allowdeletetag)
- +allowmodifytag=$(git config --bool hooks.allowmodifytag)
- +
- +# check for no description
- +projectdesc=$(sed -e '1q' "$GIT_DIR/description")
- +case "$projectdesc" in
- +"Unnamed repository"* | "")
- + echo "*** Project description file hasn't been set" >&2
- + exit 1
- + ;;
- +esac
- +
- +# --- Check types
- +# if $newrev is 0000...0000, it's a commit to delete a ref.
- +zero="0000000000000000000000000000000000000000"
- +if [ "$newrev" = "$zero" ]; then
- + newrev_type=delete
- +else
- + newrev_type=$(git cat-file -t $newrev)
- +fi
- +
- +case "$refname","$newrev_type" in
- + refs/tags/*,commit)
- + # un-annotated tag
- + short_refname=${refname##refs/tags/}
- + if [ "$allowunannotated" != "true" ]; then
- + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
- + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
- + exit 1
- + fi
- + ;;
- + refs/tags/*,delete)
- + # delete tag
- + if [ "$allowdeletetag" != "true" ]; then
- + echo "*** Deleting a tag is not allowed in this repository" >&2
- + exit 1
- + fi
- + ;;
- + refs/tags/*,tag)
- + # annotated tag
- + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
- + then
- + echo "*** Tag '$refname' already exists." >&2
- + echo "*** Modifying a tag is not allowed in this repository." >&2
- + exit 1
- + fi
- + ;;
- + refs/heads/*,commit)
- + # branch
- + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
- + echo "*** Creating a branch is not allowed in this repository" >&2
- + exit 1
- + fi
- + ;;
- + refs/heads/*,delete)
- + # delete branch
- + if [ "$allowdeletebranch" != "true" ]; then
- + echo "*** Deleting a branch is not allowed in this repository" >&2
- + exit 1
- + fi
- + ;;
- + refs/remotes/*,commit)
- + # tracking branch
- + ;;
- + refs/remotes/*,delete)
- + # delete tracking branch
- + if [ "$allowdeletebranch" != "true" ]; then
- + echo "*** Deleting a tracking branch is not allowed in this repository" >&2
- + exit 1
- + fi
- + ;;
- + *)
- + # Anything else (is there anything else?)
- + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
- + exit 1
- + ;;
- +esac
- +
- +# --- Finished
- +exit 0
- diff -Nuar efitools-1.7.0.orig/.git/index efitools-1.7.0/.git/index
- --- efitools-1.7.0.orig/.git/index 1970-01-01 02:00:00.000000000 +0200
- +++ efitools-1.7.0/.git/index 2017-12-16 21:05:59.880107278 +0300
- @@ -0,0 +1,23 @@
- +DIRC ZZ5`Ng…wZ5`Ng…w ý ÈG �¤ è d ƒ/„VÅ€M¼¦°ããù0.œ’
- +.gitignore Z5`Ng…wZ5`Ng…w ý ÈV �¤ è d ±[EK×.W}šn»ßêû´ÙûÅBÏ2 COPYING Z5`Ng…wZ5`Ng…w ý ÈW �¤ è d ‰¼^¥º"<à$Ç25÷,üÛ¸¬~y
- +HashTool.c Z5`Ng…wZ5`Ng…w ý ÈX �¤ è d mÈÆ\� „·x¤žéÌ3’|Ê©.1 HelloWorld.c Z5`Ng…wZ5`Ng…w ý ÈY �¤ è d LDžää|âYæUýKJâ¥sĵ KeyTool.c Z5`Ng…wZ5`Ng…w ý ÈZ �¤ è d d’§.·…û<±èŸ@ ħkÊ Loader.c Z5`Ng…wZ5`Ng…w ý È[ �¤ è d Ò)ß�ïíìQŒ|"[ê’Mb ()
- +LockDown.c Z5`Ng…wZ5`Ng…w ý È\ �¤ è d ëˆÕHïjk¸}ÚlÊÞ%x!BÏ
- +Make.rules Z5`Ng…wZ5`Ng…w ý È] �¤ è d áwNà®×é
- +¹ÊBÈUAJtOü Makefile Z5`Ng…wZ5`Ng…w ý È^ �¤ è d Ifý÷6‡÷åú^¸™ðOß PreLoader.c Z5`Ng…wZ5`Ng…w ý È_ �¤ è d êŽùùùy¹¡D�.1Ì8ø°/Œ README Z5`Ng…wZ5`Ng…w ý È` �¤ è d X)
g&ù¤Ò»'vm¤‡A}ýÂÕ
- +ReadVars.c Z5`Ng…wZ5`Ng…w ý Èa �¤ è d ‘Vo¬ HSüå‚\…52?i +w SetNull.c Z5`Ng…wZ5`Ng…w ý Èb �¤ è d Óº–#*Û%é¿ÿ¯3¯•¸cAÝ@þ
ShimReplace.c Z5`NvÇ·Z5`NvÇ· ý Èc �¤ è d ’-!V5 £½ZS!#Ý$ñ_ZGU UpdateVars.c Z5`NvÇ·Z5`NvÇ· ý Èd �¤ è d ‘ÔHO›Že5óäLÙ[R
- +¼Ë“�® cert-to-efi-hash-list.c Z5`NvÇ·Z5`NvÇ· ý Èe �¤ è d ×þeáT/Qæþù$ @2ˆmûFI cert-to-efi-sig-list.c Z5`NvÇ·Z5`NvÇ· ý Èg �¤ è d qsË󬬰à]D:HfÞ8�‰l doc/cert-to-efi-hash-list.1.in Z5`NvÇ·Z5`NvÇ· ý Èh �¤ è d ™U™ÞÎ îŠÀO6R·‘ÍÁQ doc/cert-to-efi-sig-list.1.in Z5`NvÇ·Z5`NvÇ· ý Èi �¤ è d ®A)ˆÖ¨�V5kÆ"ŽÕŒÑP doc/efi-readvar.1.in Z5`NvÇ·Z5`NvÇ· ý Èj �¤ è d �t¾ÐçÎj"ˆòœ´Ãø×5F doc/efi-updatevar.1.in Z5`NvÇ·Z5`NvÇ· ý Èk �¤ è d ±æˆç9;mÛ^\ú€HÏdH doc/hash-to-efi-sig-list.1.in Z5`NvÇ·Z5`NvÇ· ý Èl �¤ è d ®p<‡q)ºY…#òx®¬7Ä
- +‘D¬ doc/sig-list-to-certs.1.in Z5`NvÇ·Z5`NvÇ· ý Èm �¤ è d ÿ�r1T›yQ–sÛÄÃ$
C doc/sign-efi-sig-list.1.in Z5`NvÇ·Z5`NvÇ· ý Èn �¤ è d Š„Ÿ…Fâ½£j)jع3„ì¯À
efi-keytool.c Z5`NvÇ·Z5`NvÇ· ý Èo �¤ è d Í�k0a÷Q"
|