{"thread":{"id":"39362","subject":"Ensimag students contributing to git","startedAt":"2015-05-18T23:23:08Z","lastAt":"2015-05-20T14:03:57Z","messageCount":6,"participants":["Antoine Delaite","Stefan Beller","Christian Couder","Remi Galan Alfonso"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"261523","messageId":"388720318.919104.1431991388837.JavaMail.zimbra@ensimag.grenoble-inp.fr","threadId":"39362","inReplyTo":"722582475.919095.1431991277969.JavaMail.zimbra@ensimag.grenoble-inp.fr","subject":"Ensimag students contributing to git","fromName":"Antoine Delaite","fromEmail":"antoine.delaite@ensimag.grenoble-inp.fr","sentAt":"2015-05-18T23:23:08Z","receivedAt":"2015-05-18T23:23:08Z","isPatch":false,"sender":{"key":"antoine.delaite@ensimag.grenoble-inp.fr","avatar":"https://avatars.githubusercontent.com/u/12510393?v=4"},"body":"Hello Git community, \n\n\nWe are a team of five students from the ENSIMAG (a french school of engineering and computer science) who are going to contribute to git during a month at least and after if we have the opportunity. We will work under the supervision of Mr. Moy. \n\n\nWe are glad to contribute to git and we are looking forward to getting advices and reviews from the git community. It will be a great experience for us as young programmers. \n\n\nWe planned to work on « git pull –setupstream » for the first days if nobody is currently working on it and then we thought of finishing the work of elder contributors from the ensimag on : « git bisect fix/unfixed ». \n\n\nWe are open to any suggestions on the choice of the subjects or of any kind. \n\n\nThanks, \n\n\nAntoine Delaite \nRémi Lespinet \nRémi Galan-Alfonso \nLouis Stuber \nGuillaume Pagès \n"},{"id":"261531","messageId":"CAGZ79kZF2Ne8vLTof_hq+UL3_U2GPeExqk7qjEQ=yFb6eQkyqA@mail.gmail.com","threadId":"39362","inReplyTo":"388720318.919104.1431991388837.JavaMail.zimbra@ensimag.grenoble-inp.fr","subject":"Re: Ensimag students contributing to git","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2015-05-19T00:50:36Z","receivedAt":"2015-05-19T00:50:36Z","isPatch":false,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Mon, May 18, 2015 at 4:23 PM, Antoine Delaite\n wrote:\n> Hello Git community,\n>\n>\n> We are a team of five students from the ENSIMAG (a french school of engineering and computer science) who are going to contribute to git during a month at least and after if we have the opportunity. We will work under the supervision of Mr. Moy.\n>\n>\n> We are glad to contribute to git and we are looking forward to getting advices and reviews from the git community. It will be a great experience for us as young programmers.\n>\n>\n> We planned to work on « git pull –setupstream » for the first days if nobody is currently working on it and then we thought of finishing the work of elder contributors from the ensimag on : « git bisect fix/unfixed ».\n\ngit pull is being converted from shell to C as part of the\nGoogle Summer of Code (cc'ing Paul Tan who is the\nstudent, and Johannes Schindelin and me who are the\nmentors) so there may be some merge conflicts arising\nif we go uncoordinated. See a planned timeline of Paul\nat [1]. Depending on your timeline, it might be wise to\nhold on a bit and then base your contributions on the C\nimplementation rather than the bash implementation.\n\ngit bisect fix/unfixed sounds interesting though (just\ntoday I tried to find a fix and messed up, again). I am\nnot aware of the scope you're planning to contribute\nto within the git bisect fix/unfixed topic, though I'd like\nto share a result[2] of a discussion we had some time\nago, on how git bisect can be improved (nobody did it\nyet though).\n\nThanks,\nStefan\n\n[1] http://permalink.gmane.org/gmane.comp.version-control.git/266198\n[2] https://docs.google.com/document/d/1hzF8fZbsQtKwUPH60dsEwVZM2wmESFq713SeAsg_hkc/edit?usp=sharing\n"},{"id":"261554","messageId":"CAP8UFD2hCScvEZxxFCc4XWLJuHM-SyqZ_x4sdmwXj8WVHrW4tQ@mail.gmail.com","threadId":"39362","inReplyTo":"388720318.919104.1431991388837.JavaMail.zimbra@ensimag.grenoble-inp.fr","subject":"Re: Ensimag students contributing to git","fromName":"Christian Couder","fromEmail":"christian.couder@gmail.com","sentAt":"2015-05-19T15:10:55Z","receivedAt":"2015-05-19T15:10:55Z","isPatch":false,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Hi,\n\nOn Tue, May 19, 2015 at 1:23 AM, Antoine Delaite\n wrote:\n>\n> We planned to work on « git pull –setupstream » for the first days if nobody\n> is currently working on it and then we thought of finishing the work of elder\n> contributors from the ensimag on : « git bisect fix/unfixed ».\n\nLast Autumn I started to work a bit on « git bisect fix/unfixed » (or\nmore accurately « git bisect old/new ») by applying and reworking a\nbit what your Ensimag elders had done. It is not much but maybe it can\nhelp you a bit.\n\nIt is on this branch on my github repo:\n\nhttps://github.com/chriscool/git/commits/boldnew1\n\nThere are only 3 original patches on this branch. The first one is\nwhat your elders did and the other 2 are some small cleanups on top.\n\nYou will need to rebase and rework this, but it is a start.\n\nBest,\nChristian.\n"},{"id":"261556","messageId":"CAP8UFD2WbvHZN4vtRt3o+sYTcoBhPuW=7Dhta1XjHOoEGDxvgw@mail.gmail.com","threadId":"39362","inReplyTo":"CAGZ79kZF2Ne8vLTof_hq+UL3_U2GPeExqk7qjEQ=yFb6eQkyqA@mail.gmail.com","subject":"Re: Ensimag students contributing to git","fromName":"Christian Couder","fromEmail":"christian.couder@gmail.com","sentAt":"2015-05-19T15:39:13Z","receivedAt":"2015-05-19T15:39:13Z","isPatch":false,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"On Tue, May 19, 2015 at 2:50 AM, Stefan Beller wrote:\n>\n> git bisect fix/unfixed sounds interesting though (just\n> today I tried to find a fix and messed up, again). I am\n> not aware of the scope you're planning to contribute\n> to within the git bisect fix/unfixed topic, though I'd like\n> to share a result[2] of a discussion we had some time\n> ago, on how git bisect can be improved (nobody did it\n> yet though).\n>\n> [2] https://docs.google.com/document/d/1hzF8fZbsQtKwUPH60dsEwVZM2wmESFq713SeAsg_hkc/edit?usp=sharing\n\nIt's interesting, but the document doesn't really explain what is not\noptimal with the current algorithm and why the proposed algorithm is\nbetter.\n\nThanks,\nChristian.\n"},{"id":"261558","messageId":"CAP8UFD16vb_-rp7kiATd=XW5FK+P+qkME8hPMku571_PDCQywg@mail.gmail.com","threadId":"39362","inReplyTo":"CAP8UFD2hCScvEZxxFCc4XWLJuHM-SyqZ_x4sdmwXj8WVHrW4tQ@mail.gmail.com","subject":"Re: Ensimag students contributing to git","fromName":"Christian Couder","fromEmail":"christian.couder@gmail.com","sentAt":"2015-05-19T15:47:15Z","receivedAt":"2015-05-19T15:47:15Z","isPatch":false,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"On Tue, May 19, 2015 at 5:10 PM, Christian Couder\n wrote:\n>\n> Last Autumn I started to work a bit on « git bisect fix/unfixed » (or\n> more accurately « git bisect old/new ») by applying and reworking a\n> bit what your Ensimag elders had done. It is not much but maybe it can\n> help you a bit.\n>\n> It is on this branch on my github repo:\n>\n> https://github.com/chriscool/git/commits/boldnew1\n>\n> There are only 3 original patches on this branch. The first one is\n> what your elders did and the other 2 are some small cleanups on top.\n>\n> You will need to rebase and rework this, but it is a start.\n\nActually I rebased it on current master and it is available here:\n\nhttps://github.com/chriscool/git/commits/boldnew2\n\nBest,\nChristian.\n"},{"id":"261661","messageId":"2016988320.1099109.1432130637289.JavaMail.zimbra@ensimag.grenoble-inp.fr","threadId":"39362","inReplyTo":"CAP8UFD16vb_-rp7kiATd=XW5FK+P+qkME8hPMku571_PDCQywg@mail.gmail.com","subject":"Re: Ensimag students contributing to git","fromName":"Remi Galan Alfonso","fromEmail":"remi.galan-alfonso@ensimag.grenoble-inp.fr","sentAt":"2015-05-20T14:03:57Z","receivedAt":"2015-05-20T14:03:57Z","isPatch":false,"sender":{"key":"remi.galan-alfonso@ensimag.grenoble-inp.fr","avatar":"https://avatars.githubusercontent.com/u/12509162?v=4"},"body":"On May 19, 2015, Stefan Beller wrote :\n>On Mon, May 18, 2015 at 4:23 PM, Antoine Delaite\n> wrote:\n>> Hello Git community,\n>>\n>>\n>> We are a team of five students from the ENSIMAG (a french school of engineering and computer science) who are going to contribute to git during a month at least and after if we have the opportunity. We will work under the supervision of Mr. Moy.\n>>\n>>\n>> We are glad to contribute to git and we are looking forward to getting advices and reviews from the git community. It will be a great experience for us as young programmers.\n>>\n>>\n>> We planned to work on « git pull –setupstream » for the first days if nobody is currently working on it and then we thought of finishing the work of elder contributors from the ensimag on : « git bisect fix/unfixed ».\n>\n>git pull is being converted from shell to C as part of the\n>Google Summer of Code (cc'ing Paul Tan who is the\n>student, and Johannes Schindelin and me who are the\n>mentors) so there may be some merge conflicts arising\n>if we go uncoordinated. See a planned timeline of Paul\n>at [1]. Depending on your timeline, it might be wise to\n>hold on a bit and then base your contributions on the C\n>implementation rather than the bash implementation.\n\nThank you for the warning, we will wait for the C implementation then.\n\nOn May 19, 2015, Stefan Beller wrote :\n>I am not aware of the scope you're planning to contribute\n>to within the git bisect fix/unfixed topic, though I'd like\n>to share a result[2] of a discussion we had some time\n>ago, on how git bisect can be improved (nobody did it\n>yet though).\n\nOn May 19, 2015, Christian Couder wrote :\n>It's interesting, but the document doesn't really explain what is not\n>optimal with the current algorithm and why the proposed algorithm is\n>better.\n\nFor now we are not planning on heavily modifying the algorithm of \ngit bisect but we are rather planning on fixing an existing patch \nconsidering that we are new to the mailing list and patches \n(though we might have to modify partly the algorithm in the end, \nwe have not really begun to dwelve into the code of git bisect yet).\n\nOn May 19, 2015, Christian Couder wrote :\n>Last Autumn I started to work a bit on « git bisect fix/unfixed » (or\n>more accurately « git bisect old/new ») by applying and reworking a\n>bit what your Ensimag elders had done. It is not much but maybe it can\n>help you a bit.\n>\n>It is on this branch on my github repo:\n>[...]\n>https://github.com/chriscool/git/commits/boldnew2\n>\nThank you very much, this will be really useful.\n\nOn a different note, we have started to work on the following points, \nto get used to the code of Git, writing the tests, documentation... :\n - A possibility to configure git am so that it uses the option -3way\nautomatically by adding the boolean am.3way in .gitconfig.\nThe conversion from a bash version to a C version is no big matter.\n - Adding the possibility to use the key-word 'drop' in git rebase -i, \nit has the same effect as deleting the line (removing the commit) but \nallows a better control of your actions and reduces the possibility of\nremoving a commit by mistake.\nWe plan to work on the following points :\n - Adding warning/errors when removing commits by removing the line in\ngit rebase -i. This would be configurable through the variable \nrebase.dropBehaviour in .gitconfig, it would have 3 states ('ignore', \n'warn', 'error'). 'ignore' would be the same behavior as currently,\n'warn' would display a warning (the rebase would still proceed) when a \ncommit is removed through line removal and 'error' would stop the \nrebase instead.\n - Fixing a patch for git bisect fixed/unfixed as stated earlier.\n - Working on git pull --set-upstream (similar to what git push\n--set-upstream does) after the C implementation of git pull.\n\nThe above list is most likely to change according to the difficulty, \nthe time needed and other parameters.\n\nThanks again,\nRémi Galan Alfonso, Rémi Lespinet, Antoine Delaite, \nLouis Stuber, Guillaume Pagès\n"}]}