-
Notifications
You must be signed in to change notification settings - Fork 316
Conversation
The dos2unix calls can be removed: - in two cases, current git-submodule.sh produces CR-free output - in one case, it is enough to use test_cmp_text instead of test_cmp - in one case, test_i18ncmp calls test_cmp_text for us
Thanks! Could you split this commit into individual commits, committing with |
Ah, never mind, I found it. Just need to remember to squash it next time round. |
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Thanks! |
Actually, there is more things to be cleaned up around the "funny CR issue". |
@kasal You will find that 616c7ba merges that topic branch, and acf70ef is its first commit (branching directly off of the commit starting the merging-rebase). I considered enhancing the |
"@dscho Never mind, I have found that in the log." |
... but your comment shows how to get there with Actually, the My plan is like this:
I could then send you PR's for branches Would you be willing to redo the 1.9.2 rebase so that these changes could be included into msysgit 1.9.2? If yes, by when do you need the PR's from me? [1] Explanation: |
My preferred way would be one of two ways:
As to the time line: I planned on releasing today ("In keeping with the fine tradition of releasing on a Friday and immediately leaving for the weekend ..."). |
ok, so first branch is Second branch I have not tested the resulting version, but if I broke something, it should be obvious to get the fix back.... ;-) |
See https://github.com/msysgit/git/compare/win-tests-rebase... Now for a test run... |
@dscho Unfortunately, this is not right. You merged It would work, if you did the reverting first, then merged both Or, if you are willing to do even more rewriting of published version, you could |
My original idea was to create a new starting point "Start the merging-rebase to v1.9.2", then redo all the merging rebase, omitting But I can see now that the point of the "Start merging rebase" commit is that it takes all content from upstream, yet it is a successor of previous |
Well, at the moment, there are three Unless you insist to have it fixed right away (in which case you can easily perform what I would do later by calling It is not a big deal if you cannot find the time to do it; As for myself, I spent two weeks of my Git time budget on the release, so I will have to refrain from doing much on Git for Windows for one week. |
Thank you very much for all the explanations. |
The dos2unix calls can be removed: