git - How can a revert commit also be a merge commit? -


recently @ work, lost code on project under version control using git (and private github repository).

i used git bisect find culprit commit, , got surprised discovering looking revert commit, had 2 parents merge commits :

commit b5f97311eea2905baf8a96fddec22321d952f05c merge: 8cc7371 131d463 author: bob <bob@othercompany.com> date:   fri may 22 19:42:25 2015 +0200      revert "isb-cpw-3627 - mise en place du calage des filtres ds1/ds2/ds3/ds4"      reverts commit 8cc7371e7133b68db95ac8e9aeb730d7889a1166.

this issue has been resolved creating new branch ancestor commit, , applying patches on top of new branch.

so don't need fix that, want understand how can revert commit merge commit, happened, , how reproduce weird behavior.

i tried reproduce :

  • create new branch @ 8cc7371
  • git revert 8cc7371

it creates revert commit single parent (8cc7371) expected.

the culprit commit author uses atlassian sourcetree instead of native command line interface, tried using revert feature within sourcetree , got same result above (single parent).

after running git commands on b5f9731, noticed git diff , git show not reporting same file set :

$ git diff b5f9731..8cc7371 --name-only => 2 files :    application/sites/frontend/views/scripts/layout/foobar/pointsdevente/index.tpl    public/media/design/frontend/css/main-dev.css $ git show --oneline --name-only  b5f9731 => 1 file :    public/media/design/frontend/css/main-dev.css

sourcetree , github showing 2 files.

you can find how graph looks here : graph.html, , git commands results there : misc.html.

could explain happened b5f9731 ?

what comes mind:

git revert ... # new commit abcdef git merge ... # new commit fedcba git rebase -i head~2  pick abcdef - original revert commit squash fedcba - merge commit

message taken abcdef.

this results in new b5f9731. has 2 parents merge commit , message revert commit.


-

Comments

Post a Comment

Popular posts from this blog

facebook - android ACTION_SEND to share with specific application only -

in android application have 4 buttons facebook , viber , telegram , whatsapp , want share different content based on each button. for example if user clicks on viber button want user action_send share content viber only. i found this explains how facebook , twitter seems it's calling specific class name of application don't know applications wanna use except facebook. all android apps have unique id, first have check if these apps installed in user's device , can pass unique id via intent sharing. according below: unique ids different apps : viber : com.viber.voip telegram : org.telegram.messenger whatsapp : com.whatsapp check if these apps installed , if installed send messages through intent. private void sendmessage(context context,string message, string appids) { final boolean isappinstalled =isappavailable(context, appids); if (isappinstalled) { intent myintent = new intent(intent.action_send); myintent.settype("text/p...
Read more

python - Creating a new virtualenv gives a permissions error -

i'm getting following output when running virtualenv newvenv . traceback (most recent call last): file "/usr/local/bin/virtualenv", line 5, in <module> pkg_resources import load_entry_point file "/usr/lib/python2.7/dist-packages/pkg_resources.py", line 2727, in <module> add_activation_listener(lambda dist: dist.activate()) file "/usr/lib/python2.7/dist-packages/pkg_resources.py", line 700, in subscribe callback(dist) file "/usr/lib/python2.7/dist-packages/pkg_resources.py", line 2727, in <lambda> add_activation_listener(lambda dist: dist.activate()) file "/usr/lib/python2.7/dist-packages/pkg_resources.py", line 2227, in activate self.insert_on(path) file "/usr/lib/python2.7/dist-packages/pkg_resources.py", line 2334, in insert_on self.check_version_conflict() file "/usr/lib/python2.7/dist-packages/pkg_resources.py", line 2373, in check_version_conflict...
Read more

go - Idiomatic way to handle template errors in golang -

say have html/template following: <html> <body> <p>{{somefunc .somedata}}</p> </body> and somefunc returns error. there idiomatic way deal this? if write directly responsewriter , status code 200 has been written before encounter error. var tmpl *template.template func handler(w http.responsewriter, r *http.request) { err := tmpl.execute(w, data) // "<html><body><p>" has been written... // err? } preferably return status code 400 or such, can't see way if use template.execute directly on responsewriter . there i'm missing? since template engine generates output on-the-fly, parts of template preceding somefunc call sent output. , if output not buffered, (along http 200 status) may sent. you can't that. what can perform check before call template.execute() . in trivial case should enough call somefunc() , check return value. if choose path , return value of somefunc() c...
Read more