Re: [OT] Finally getting around to switching to Git
Chris, On 4/25/2019 12:08 PM, Christopher Schultz wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Igal, On 4/25/19 14:42, Igal Sapir wrote: On 4/25/2019 11:30 AM, Coty Sutherland wrote: If you clone a single branch with no references such as `git clone apache/tomcat -b master --single-branch` then you get just the references/history for the master branch which results in about a 70M .git directory. So one needs to consider whether that added layer of complexity is worth the savings of 30M disk space, even when multiplied over 3 branches. Imagine the reclaimed space after deleting the local SVN directories ;) For Tomcat 8.5.x @ r1852558: $ du -hs .svn/ 41M .svn/ Interesting. Maybe the tomcat-site SVN repo threw me off. I didn't bother to look at the breakdown of the project and the site: E:\Workspace\svn\tomcat\tomcat > du -sh . 85M E:\Workspace\svn\tomcat\tomcat > cd ../site E:\Workspace\svn\tomcat\site > du -sh . 1.4G Anyway, good to know. Thanks, Igal - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Finally getting around to switching to Git
Chris, On 4/25/2019 12:07 PM, Christopher Schultz wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Igal, On 4/25/19 14:03, Igal Sapir wrote: Chris, On 4/25/2019 10:32 AM, Christopher Schultz wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Igal, On 4/23/19 12:52, Igal Sapir wrote: Another thing that I have changed in my workflow based on Mark's past suggestion, is that I keep a local repo for each major branch now. Okay, I have done the following: 1. Fork tomcat master to my own GitHub account Since you are a committer you don't need to this. That is useful though if you want to show a large update so that others can review it, but you can also do that in a new branch. 2. git clone URL 3. edit/add/commit/push 4. Create a PR I'm sure I can import the PR into tomcat-master. No problem. Now, when attempting to keep my fork current, I've always done something like: git remote add upstream master-url git checkout master git fetch upstream And I'm all up-to-date. When I did that, I ended up bringing-down the 7.0.x and 8.5.x branches as well. How can I limit the upstream to just the master? Or does my fork have to have everything, but I have to checkout a single branch? If so, I'm not sure how to do that. Your fork has the whole git repository, but fortunately git manages resources much better than Subversion, for example, so it's not too bad at all. You can see a list of the local branches and which branch you are currently on with the command, `git branch`, which will show something like this: git branch 7.0.x 8.5.x * master $ git branch * master So it looks like I forked the branch, which was the intent. To get this down to my local system, I just did a "git clone [my-repo-url]" and that's what I got. I'm pretty sure that you have the whole repository with all three branches, but only one local tracking branch (the default master branch). Try to run `git branch -a` and it should show you all of the branches, including remote ones. I have set up a new local repo to test (hopefully my new line characters are preserved in fixed font).: igal@localhost c:\Temp > git clone https://github.com/apache/tomcat Cloning into 'tomcat'... remote: Enumerating objects: 99, done. remote: Counting objects: 100% (99/99), done. remote: Compressing objects: 100% (50/50), done. remote: Total 342523 (delta 54), reused 75 (delta 40), pack-reused 342424 Receiving objects: 100% (342523/342523), 88.78 MiB | 7.71 MiB/s, done. Resolving deltas: 100% (225766/225766), done. Checking out files: 100% (4005/4005), done. igal@localhost c:\Temp > cd tomcat This is what you see now: igal@localhost c:\Temp\tomcat > git branch * master This shows the remote branches as well: igal@localhost c:\Temp\tomcat > git branch -a * master remotes/origin/7.0.x remotes/origin/8.5.x remotes/origin/HEAD -> origin/master remotes/origin/master Checking out a branch that exists remotely but not locally creates a local branch that tracks the remote one: igal@localhost c:\Temp\tomcat > git checkout 8.5.x Checking out files: 100% (1787/1787), done. *Branch '8.5.x' set up to track remote branch '8.5.x' from 'origin'.* Switched to a new branch '8.5.x' Listing the branches now shows the new local branch: igal@localhost c:\Temp\tomcat > git branch -a * 8.5.x master remotes/origin/7.0.x remotes/origin/8.5.x remotes/origin/HEAD -> origin/master remotes/origin/master The `*` denotes the current branch, so I am on the master branch. Switching to the 8.5.x branch with `git checkout 8.5.x` git checkout 8.5.x Checking out files: 100% (1787/1787), done. Switched to branch '8.5.x' Your branch is up to date with 'origin/8.5.x'. And then running again `git branch` will show the * next to 8.5.x: git branch 7.0.x * 8.5.x master In some projects it's easy to maintain a single repository and switch between branches, but I find the differences between 7.0.x and master to be so major that I chose to follow Mark's method and keep separate local copies where the IDE settings do not get mangled up each time I switch branches. Sounds good. What is Mark's Method™? Is it documented anywhere? Most git users, as well as myself until recently, use one repository and switch between branches as needed. You need to work on 7.0.x, you do `git checkout 7.0.x`, work on it, commit and push your changes, and then check out another branch to work on. The changes between 7.0.x and 8.5.x are so vast that switching between 7.0.x and the other two branches messed up my IDE, so what I refer to as Mark's Method™ is to have 3 local directories/repos (tomcat, tomcat-8.5.x, tomcat-7.0.x), one for each main branch. Each directory/repo stays on its own branch, and the branches are created . When I want to synchronize them, I do a push in one directory, and then a pull in the
Re: [OT] Finally getting around to switching to Git
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Igal, On 4/25/19 14:42, Igal Sapir wrote: > On 4/25/2019 11:30 AM, Coty Sutherland wrote: >> If you clone a single branch with no references such as `git >> clone apache/tomcat -b master --single-branch` then you get just >> the references/history for the master branch which results in >> about a 70M .git directory. > > So one needs to consider whether that added layer of complexity is > worth the savings of 30M disk space, even when multiplied over 3 > branches. Imagine the reclaimed space after deleting the local SVN > directories ;) For Tomcat 8.5.x @ r1852558: $ du -hs .svn/ 41M.svn/ - -chris -BEGIN PGP SIGNATURE- Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/ iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlzCBZkACgkQHPApP6U8 pFh/1g//aKPqBxa5PV6G1D17+LdnivuxF5BjfJgpz/DpvlAFiK0OP/osob4Yklbx JXwF0kt6LWHI5jNBYPtlGRw77gourRAh85kxudwwBcebIqQ0Kqg8MV8BEgcZrPU5 CRp0P+LkbqRnXRyinpwY6c4pWoPnufh6F4jdadkmhssZFnKOZa45+vadMhwTSDsq FrrtE5DhVhWFo1o4ee5HbRn71Q4lmDGXGS6QiEpb6Q2fRNrqn8+tYNNx5+sy/whk piyX1df0XZvt/6mHtfkZfrhJPcLG1vZ0t5lmWvqZIZUftxpJikgGBBQVSVSQPcYU HhR3ylD26fT0gianEivqK0JMheCw5jNYcz0UlqtjuQSQFajG/cUbK63hA3o7h9ls bJU+gUy+3s+ewZxQUZVnvzWK4n7Zm9W+GqVR30Eiin5PtaCqd2qX08FqJjCk3h2D ISkLJ3aymDmJ96zLgRGe3KSvSOl27Niv+NVrFyxxvymnzEgG6TmJaqZmYsbHud/k kiXBGuvw6o1KB47RybyZdx6sloBTZfbIgzBkilLXcJKpHMJy+kwTltJeI1Z8tWCT e4l13ikL7Oma2MBIQnOxUImmL2Q0oX5dwMY/ojnFWTAdBlPhLOi9kQ/TOTnuXDEK AQh42hKrtK8gst/CEYwk7/2IhjbA6DB3E0EszBBYlehh972Xaz0= =4QWj -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Finally getting around to switching to Git
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Igal, On 4/25/19 14:03, Igal Sapir wrote: > Chris, > > On 4/25/2019 10:32 AM, Christopher Schultz wrote: >> -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 >> >> Igal, >> >> On 4/23/19 12:52, Igal Sapir wrote: >>> Another thing that I have changed in my workflow based on >>> Mark's past suggestion, is that I keep a local repo for each >>> major branch now. >> Okay, I have done the following: >> >> 1. Fork tomcat master to my own GitHub account > > Since you are a committer you don't need to this. That is useful > though if you want to show a large update so that others can review > it, but you can also do that in a new branch. > >> 2. git clone URL 3. edit/add/commit/push 4. Create a PR >> >> I'm sure I can import the PR into tomcat-master. No problem. >> >> Now, when attempting to keep my fork current, I've always done >> something like: >> >> git remote add upstream master-url git checkout master git fetch >> upstream >> >> And I'm all up-to-date. >> >> When I did that, I ended up bringing-down the 7.0.x and 8.5.x >> branches as well. How can I limit the upstream to just the >> master? >> >> Or does my fork have to have everything, but I have to checkout >> a single branch? If so, I'm not sure how to do that. > > Your fork has the whole git repository, but fortunately git > manages resources much better than Subversion, for example, so it's > not too bad at all. > > You can see a list of the local branches and which branch you are > currently on with the command, `git branch`, which will show > something like this: > >> git branch > 7.0.x 8.5.x * master $ git branch * master So it looks like I forked the branch, which was the intent. To get this down to my local system, I just did a "git clone [my-repo-url]" and that's what I got. > The `*` denotes the current branch, so I am on the master branch. > Switching to the 8.5.x branch with `git checkout 8.5.x` > >> git checkout 8.5.x > Checking out files: 100% (1787/1787), done. Switched to branch > '8.5.x' Your branch is up to date with 'origin/8.5.x'. > > And then running again `git branch` will show the * next to 8.5.x: > >> git branch > 7.0.x * 8.5.x master > > In some projects it's easy to maintain a single repository and > switch between branches, but I find the differences between 7.0.x > and master to be so major that I chose to follow Mark's method and > keep separate local copies where the IDE settings do not get > mangled up each time I switch branches. Sounds good. What is Mark's Method™? Is it documented anywhere? - -chris -BEGIN PGP SIGNATURE- Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/ iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlzCBY0ACgkQHPApP6U8 pFjFiQ/+NZUw8qibULk3l7q08ZJy4MB9JSOnvUpEVzUs59QZugA6W64M0t/Ciywj /AQ4Cmj+SYlz6pe6ryJlL10cqii/UntSmUyYULxIUb7LbqRB6oKyg16v3qsb3BPJ HlY6IjDfrFgNz7WOrIwhaireeS0k4v/a5m7yFp4YmWhePVISjnrYLkCQ9WSR1cWl wNTBE3cBAq4g2PDzmzS/Fmd5Sm0MIiLhm1FdOoMeYNTVJFJm3+1MPbQ6bpni3nvV t392j/he2csCLN6yR9L02GsTU2zlhWwjrL0t8X4b6HR6AU4WV+vjF9q7kv9ULYMW UjPYwOYm/AykFJWN5S5YBfngMlleQkwTXGcmeAN68vju/9FxqyY6WIYXefoon+18 LiVPv2mHBlrAB70sSe6W2hcuUEPZDVuNauHILJDqkXM1EGx3KvzWT1I3PTvf3AAG 9ShbwRep2FLHHyiGd7/B4sny398SzxEW9D3wABl1nCMhuN2s7YAVzAKle75rUlTw Fdw9JDmv+2zwz0dM1TPGVcgb7NsIn3pInSMSekrcUiZM4mfhLcYunwymWm4u4Ypt O7KQbgnFzZ5BdnBrm3Qy3ng/B23gRhR7gYUFtIzVQwrbdZPAS0LFlyaQwfho/T1/ 5QJSDdSm3R/eZ3xeSk87TS6M0ABtH0G5+AS1v1x973Hp/7yMEhA= =eJB7 -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Finally getting around to switching to Git
Coty, On 4/25/2019 11:30 AM, Coty Sutherland wrote: On Thu, Apr 25, 2019 at 2:06 PM Igal Sapir wrote: On 4/25/2019 10:56 AM, Coty Sutherland wrote: On Thu, Apr 25, 2019 at 1:32 PM Christopher Schultz < ch...@christopherschultz.net> wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Igal, On 4/23/19 12:52, Igal Sapir wrote: Another thing that I have changed in my workflow based on Mark's past suggestion, is that I keep a local repo for each major branch now. Okay, I have done the following: 1. Fork tomcat master to my own GitHub account 2. git clone URL 3. edit/add/commit/push 4. Create a PR I'm sure I can import the PR into tomcat-master. No problem. Now, when attempting to keep my fork current, I've always done something like: git remote add upstream master-url git checkout master git fetch upstream And I'm all up-to-date. When I did that, I ended up bringing-down the 7.0.x and 8.5.x branches as well. How can I limit the upstream to just the master? You can set the branch for your remote to master (or do it when you clone) which should ignore other branches: git remote set-branches upstream master Then optionally configure --no-tags in your git config (or use --no-tags each time you git-fetch): git config --add remote.upstream.tagOpt --no-tags Then try fetching to verify it worked: git fetch upstream [--dry-run] Or does my fork have to have everything, but I have to checkout a single branch? If so, I'm not sure how to do that. It doesn't, but by default a `git fetch` pulls down all new work that exists on the remote, but not your local clone. I am sure that Coty knows git better than I do, so if he says that it doesn't then I stand corrected. I don't know about that :) If you do a regular `git clone apache/tomcat` it will pull the master branch and then references/histories for all remote branches which for tomcat is about a 100M .git directory. If you clone a single branch with no references such as `git clone apache/tomcat -b master --single-branch` then you get just the references/history for the master branch which results in about a 70M .git directory. So one needs to consider whether that added layer of complexity is worth the savings of 30M disk space, even when multiplied over 3 branches. Imagine the reclaimed space after deleting the local SVN directories ;) I think that working with the https://github.com/apache/tomcat as the origin will make things much easier for Chris. Especially with keeping the local repo up to date with the origin since he wouldn't need to use his fork. Best, Igal - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Finally getting around to switching to Git
On Thu, Apr 25, 2019 at 2:06 PM Igal Sapir wrote: > On 4/25/2019 10:56 AM, Coty Sutherland wrote: > > On Thu, Apr 25, 2019 at 1:32 PM Christopher Schultz < > > ch...@christopherschultz.net> wrote: > > > >> -BEGIN PGP SIGNED MESSAGE- > >> Hash: SHA256 > >> > >> Igal, > >> > >> On 4/23/19 12:52, Igal Sapir wrote: > >>> Another thing that I have changed in my workflow based on Mark's > >>> past suggestion, is that I keep a local repo for each major branch > >>> now. > >> Okay, I have done the following: > >> > >> 1. Fork tomcat master to my own GitHub account > >> 2. git clone URL > >> 3. edit/add/commit/push > >> 4. Create a PR > >> > >> I'm sure I can import the PR into tomcat-master. No problem. > >> > >> Now, when attempting to keep my fork current, I've always done > >> something like: > >> > >> git remote add upstream master-url > >> git checkout master > >> git fetch upstream > >> > >> And I'm all up-to-date. > >> > >> When I did that, I ended up bringing-down the 7.0.x and 8.5.x branches > >> as well. How can I limit the upstream to just the master? > >> > > You can set the branch for your remote to master (or do it when you > clone) > > which should ignore other branches: > > git remote set-branches upstream master > > > > Then optionally configure --no-tags in your git config (or use --no-tags > > each time you git-fetch): > > git config --add remote.upstream.tagOpt --no-tags > > > > Then try fetching to verify it worked: > > git fetch upstream [--dry-run] > > > > > >> Or does my fork have to have everything, but I have to checkout a > >> single branch? If so, I'm not sure how to do that. > >> > > It doesn't, but by default a `git fetch` pulls down all new work that > > exists on the remote, but not your local clone. > > I am sure that Coty knows git better than I do, so if he says that it > doesn't then I stand corrected. > I don't know about that :) If you do a regular `git clone apache/tomcat` it will pull the master branch and then references/histories for all remote branches which for tomcat is about a 100M .git directory. If you clone a single branch with no references such as `git clone apache/tomcat -b master --single-branch` then you get just the references/history for the master branch which results in about a 70M .git directory. Note: the sytnax above is because I alias hub (https://hub.github.com/) to `git` :) Check it out if you'd like to stop visiting the GitHub web UI for opening PRs, etc. > Igal > > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: Finally getting around to switching to Git
On 4/25/2019 10:56 AM, Coty Sutherland wrote: On Thu, Apr 25, 2019 at 1:32 PM Christopher Schultz < ch...@christopherschultz.net> wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Igal, On 4/23/19 12:52, Igal Sapir wrote: Another thing that I have changed in my workflow based on Mark's past suggestion, is that I keep a local repo for each major branch now. Okay, I have done the following: 1. Fork tomcat master to my own GitHub account 2. git clone URL 3. edit/add/commit/push 4. Create a PR I'm sure I can import the PR into tomcat-master. No problem. Now, when attempting to keep my fork current, I've always done something like: git remote add upstream master-url git checkout master git fetch upstream And I'm all up-to-date. When I did that, I ended up bringing-down the 7.0.x and 8.5.x branches as well. How can I limit the upstream to just the master? You can set the branch for your remote to master (or do it when you clone) which should ignore other branches: git remote set-branches upstream master Then optionally configure --no-tags in your git config (or use --no-tags each time you git-fetch): git config --add remote.upstream.tagOpt --no-tags Then try fetching to verify it worked: git fetch upstream [--dry-run] Or does my fork have to have everything, but I have to checkout a single branch? If so, I'm not sure how to do that. It doesn't, but by default a `git fetch` pulls down all new work that exists on the remote, but not your local clone. I am sure that Coty knows git better than I do, so if he says that it doesn't then I stand corrected. Igal - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Finally getting around to switching to Git
Chris, On 4/25/2019 10:32 AM, Christopher Schultz wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Igal, On 4/23/19 12:52, Igal Sapir wrote: Another thing that I have changed in my workflow based on Mark's past suggestion, is that I keep a local repo for each major branch now. Okay, I have done the following: 1. Fork tomcat master to my own GitHub account Since you are a committer you don't need to this. That is useful though if you want to show a large update so that others can review it, but you can also do that in a new branch. 2. git clone URL 3. edit/add/commit/push 4. Create a PR I'm sure I can import the PR into tomcat-master. No problem. Now, when attempting to keep my fork current, I've always done something like: git remote add upstream master-url git checkout master git fetch upstream And I'm all up-to-date. When I did that, I ended up bringing-down the 7.0.x and 8.5.x branches as well. How can I limit the upstream to just the master? Or does my fork have to have everything, but I have to checkout a single branch? If so, I'm not sure how to do that. Your fork has the whole git repository, but fortunately git manages resources much better than Subversion, for example, so it's not too bad at all. You can see a list of the local branches and which branch you are currently on with the command, `git branch`, which will show something like this: > git branch 7.0.x 8.5.x * master The `*` denotes the current branch, so I am on the master branch. Switching to the 8.5.x branch with `git checkout 8.5.x` > git checkout 8.5.x Checking out files: 100% (1787/1787), done. Switched to branch '8.5.x' Your branch is up to date with 'origin/8.5.x'. And then running again `git branch` will show the * next to 8.5.x: > git branch 7.0.x * 8.5.x master In some projects it's easy to maintain a single repository and switch between branches, but I find the differences between 7.0.x and master to be so major that I chose to follow Mark's method and keep separate local copies where the IDE settings do not get mangled up each time I switch branches. I'm just *sure* I'm gonna love git once I get this all figured out. All the cool kids seem to love it, so it must be better, right? It is WAY better, and I'm not even cool (let alone a kid)! Best, Igal - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Finally getting around to switching to Git
On Thu, Apr 25, 2019 at 1:32 PM Christopher Schultz < ch...@christopherschultz.net> wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > Igal, > > On 4/23/19 12:52, Igal Sapir wrote: > > Another thing that I have changed in my workflow based on Mark's > > past suggestion, is that I keep a local repo for each major branch > > now. > > Okay, I have done the following: > > 1. Fork tomcat master to my own GitHub account > 2. git clone URL > 3. edit/add/commit/push > 4. Create a PR > > I'm sure I can import the PR into tomcat-master. No problem. > > Now, when attempting to keep my fork current, I've always done > something like: > > git remote add upstream master-url > git checkout master > git fetch upstream > > And I'm all up-to-date. > > When I did that, I ended up bringing-down the 7.0.x and 8.5.x branches > as well. How can I limit the upstream to just the master? > You can set the branch for your remote to master (or do it when you clone) which should ignore other branches: git remote set-branches upstream master Then optionally configure --no-tags in your git config (or use --no-tags each time you git-fetch): git config --add remote.upstream.tagOpt --no-tags Then try fetching to verify it worked: git fetch upstream [--dry-run] > > Or does my fork have to have everything, but I have to checkout a > single branch? If so, I'm not sure how to do that. > It doesn't, but by default a `git fetch` pulls down all new work that exists on the remote, but not your local clone. > > I'm just *sure* I'm gonna love git once I get this all figured out. > All the cool kids seem to love it, so it must be better, right? > :D > > - -chris > -BEGIN PGP SIGNATURE- > Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/ > > iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlzB7zMACgkQHPApP6U8 > pFh2vA/9EnR8sJPLuF1pD31HECEckVVXnF0AlU2XzTjiPsWwDP+Z+jJAh5Q8KUG6 > zwdM17VuN3Yr3e6p55DGjD4EEn1OV2hxw1Ao/TnEJXHsDrt9Hhm9j0T4ddJRCPBk > RSP2/by6pBneYr8jPnT0G9D2M+CZUI/cXIj4ntZ9w8+2lIOayR/B0H8Gfc077k+y > hXza7mnxtm4W+mNfMz176Z19hn9culA6/Z9p/4ZqFAGwVnkItNvPKuJi+syfR9La > LtJ3WY2Ut3g4KzL5D9YIrTzNf3rRKQLe8qgErUc18uhxOD8Ax5QG7x3VkXBlG8s1 > YFFvwVKmVNlG8pldle3eyBg/xE6IfxD5IYjWWPeScrpwSCnSSN2E77HyOqG1FlSl > /F5x4b1Qo8lVUuD5jgYaUQOxHuwFmuM6jyHknJfzrHB3feLjwEYxMgTfDNJoPSd/ > 70Czh7at8HxYb5S9wQHWK4oZVSEpNoWENK0BnP2qyGbZ99kfIG1bo/Iev3P9etxx > hWp1edDxb3msATQL3eyFCUhHis1T9nnVKK19y8XoPt0PqrmLUhc/Vm+RyGFxJLeS > +xSU4v2GXsG07eQnK4jqLPUVV87PqFPKP+DHoFzE7rm8KYYtbgLtkmfhqKtvZnj7 > KZfqqYHViQzm6lP8CgWtPsOkbYh5xvkVZly2PiPPVC9v47Gp36U= > =+ROt > -END PGP SIGNATURE- > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: Finally getting around to switching to Git
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Igal, On 4/23/19 12:52, Igal Sapir wrote: > Another thing that I have changed in my workflow based on Mark's > past suggestion, is that I keep a local repo for each major branch > now. Okay, I have done the following: 1. Fork tomcat master to my own GitHub account 2. git clone URL 3. edit/add/commit/push 4. Create a PR I'm sure I can import the PR into tomcat-master. No problem. Now, when attempting to keep my fork current, I've always done something like: git remote add upstream master-url git checkout master git fetch upstream And I'm all up-to-date. When I did that, I ended up bringing-down the 7.0.x and 8.5.x branches as well. How can I limit the upstream to just the master? Or does my fork have to have everything, but I have to checkout a single branch? If so, I'm not sure how to do that. I'm just *sure* I'm gonna love git once I get this all figured out. All the cool kids seem to love it, so it must be better, right? - -chris -BEGIN PGP SIGNATURE- Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/ iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlzB7zMACgkQHPApP6U8 pFh2vA/9EnR8sJPLuF1pD31HECEckVVXnF0AlU2XzTjiPsWwDP+Z+jJAh5Q8KUG6 zwdM17VuN3Yr3e6p55DGjD4EEn1OV2hxw1Ao/TnEJXHsDrt9Hhm9j0T4ddJRCPBk RSP2/by6pBneYr8jPnT0G9D2M+CZUI/cXIj4ntZ9w8+2lIOayR/B0H8Gfc077k+y hXza7mnxtm4W+mNfMz176Z19hn9culA6/Z9p/4ZqFAGwVnkItNvPKuJi+syfR9La LtJ3WY2Ut3g4KzL5D9YIrTzNf3rRKQLe8qgErUc18uhxOD8Ax5QG7x3VkXBlG8s1 YFFvwVKmVNlG8pldle3eyBg/xE6IfxD5IYjWWPeScrpwSCnSSN2E77HyOqG1FlSl /F5x4b1Qo8lVUuD5jgYaUQOxHuwFmuM6jyHknJfzrHB3feLjwEYxMgTfDNJoPSd/ 70Czh7at8HxYb5S9wQHWK4oZVSEpNoWENK0BnP2qyGbZ99kfIG1bo/Iev3P9etxx hWp1edDxb3msATQL3eyFCUhHis1T9nnVKK19y8XoPt0PqrmLUhc/Vm+RyGFxJLeS +xSU4v2GXsG07eQnK4jqLPUVV87PqFPKP+DHoFzE7rm8KYYtbgLtkmfhqKtvZnj7 KZfqqYHViQzm6lP8CgWtPsOkbYh5xvkVZly2PiPPVC9v47Gp36U= =+ROt -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] isapir commented on issue #160: Add javadoc to describe IntrospectionUtils.isInstance
isapir commented on issue #160: Add javadoc to describe IntrospectionUtils.isInstance URL: https://github.com/apache/tomcat/pull/160#issuecomment-486764240 Is your remote configured for https:// (rather than git://)?. Run `git remote -v` to view the remote URLs. I was trying at first to use the git:// scheme and it didn't work. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] ChristopherSchultz commented on issue #160: Add javadoc to describe IntrospectionUtils.isInstance
ChristopherSchultz commented on issue #160: Add javadoc to describe IntrospectionUtils.isInstance URL: https://github.com/apache/tomcat/pull/160#issuecomment-486762240 Just exercising everything to make sure it works how I expect it to work. For example, Eclipse crapped its pants when I tried to import my fork of tomcat-master. It seems like the GitHub 2FA basically makes Eclipse stop working. I'm sure it has something to do with cached credentials in one of the dozen or so keychains that are in play, here. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: JDK 13 - Early Access build 17 is available
On 19/04/2019 13:40, Rory O'Donnell wrote: > > *Hi Mark, * > > *OpenJDK builds *- JDK 13 - Early Access build 17 is available at > http://jdk.java.net/13/ FYI, Built and run Tomcat 9.0.x/master unit tests without any failures. Built Tomcat 9.0.x/master and passed a (very) basic smoke test. No issues found. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Becoming graalvm friendly?
On Wed, Apr 24, 2019 at 6:29 PM Romain Manni-Bucau wrote: > Awesome news Rémy, thanks for sharing! > Next roadblock is https://github.com/oracle/graal/issues/684 It's probably not 100% mandatory but I'd rather have a minimum of flexibility (I'm not a big believer of Java only embedding since configuration can get complex fast and it's harder to maintain long term). Feel free to help if you'd like. Rémy
[GitHub] [tomcat] uhees opened a new pull request #161: Early check end of input condition to avoid ArrayIndexOutOfBoundsExceptions
uhees opened a new pull request #161: Early check end of input condition to avoid ArrayIndexOutOfBoundsExceptions URL: https://github.com/apache/tomcat/pull/161 Exceptions are expensive and should only be thrown in an exceptional state. End of input is no exception but should be expected. With the previous code a perfectly valid hostname will produce and process two ArrayIndexOutOfBoundsExceptions at its end, one in HttpParser.isAlpha() and one in HttpParser.isNumeric(), before detecting the end of input. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
