git is changing to the master branch
Closed this issue · 13 comments
Hey @jnavila I know you are super busy, but I just want to have your opinion on this since you understands Opam and your project and I don't.
I changed gitplotshich to generate and keep the original .svg files even if commits don't have any difference. This is just one or two lines of code.
The issue I am facing is that the git repository is changing the branch automatically for some reason. It is always moving to the master' branch. In one project it dosn't have masterit onoly hasmain` and the other project I am working on a different branch.
So, since I was not able to track where the issue is. Could you check this code, to see if I am doing something that is not right?
My idea was just to remove that if on line 141.
The comparison is here if you need more space to check.
master...leoheck:master
Or maybe this code has nothing to do with the thing I want to do. hehe
It has nothing to do with what you wanted to do 😆 . This part of the code is for displaying the textual diff in case the visual diff is null (both files are identical). The test is checking that the user required the textual diff via the command line option -t.
As a matter of fact, it seems that my last change (after I discovered I could miss some diffs if the sch files are identical but the libs have changed) makes plotgitsch draw the diffs all the time.
As for the master branch issue, the ocaml-git library is only an explorer of the git repository files. To my knowledge, it does not change anything to your working directory. plotgitsch retrieves files content from the database, and only uses git to parse revisions. I cannot be 100% sure, but the changes to the working tree are most probably not done here.
I spoke too quick. plotgitsch indeed changes to master... How come ?
I opened a ticket: mirage/ocaml-git#489
This is nice. Thank you.
The patch mirage/ocaml-git#490 solves the issue.
Interesting how much code was added to fix this. The workaround I was doing was to save .git/HEAD before executing plotgitsch and restoring it right after.
This mirage/ocaml-git#490 merged. Should I do something here? Update any version? How does this work to propagate these changes?
It's been merged but not tagged yet. If you want to test with this feature, clone the repo and tag carton, carton-git, carton-lwt, git and git-unix in this repo, refresh and update your opam packages and reinstall plotgitsch.
Yeah, I want to do that. Thank you for these instructions. I will let this issue opened so you can track this but feel free to close it if you want.
Good news! Upstream is available in opam: ocaml/opam-repository#18558