Re: [vim/vim] patch 9.1.1905: tabpanel: truncates terminal output (1ff3e70)

[hokorobi]

Thank you for the correction!

—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/commit/1ff3e701e49c04162c1bd68b58fb6588dda89fe0/170351599@github.com>

[Tony Mechelynck]

Patch 9.1.1905 ? I went over from Mercurial to git after patch 9.1.1896 plus two runtime changes, and "git status" never told me anything other than the following:

On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean

so if there exists a patch 9.1.1905 I'm missing at least nine patchlevels. Where are they ?

Best regards,

Tony.

--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

---
You received this message because you are subscribed to the Google Groups "vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+u...@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/vim_dev/vim/vim/commit/1ff3e701e49c04162c1bd68b58fb6588dda89fe0/170351599%40github.com.

[vim-dev ML]

Patch 9.1.1905 ? I went over from Mercurial to git after patch 9.1.1896
plus two runtime changes, and "git status" never told me anything other
than the following:

On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean

so if there exists a patch 9.1.1905 I'm missing at least nine patchlevels.
Where are they ?

Best regards,
Tony.

On Wed, Nov 12, 2025 at 2:26 PM hokorobi ***@***.***> wrote:

> Thank you for the correction!
>
> —
> Reply to this email directly, view it on GitHub

> <https://github.com/vim/vim/commit/1ff3e701e49c04162c1bd68b58fb6588dda89fe0#commitcomment-170351599>
> .
> You are receiving this because you are subscribed to this thread.Message
> ID: <vim/vim/commit/1ff3e701e49c04162c1bd68b58fb6588dda89fe0/170351599@

> github.com>
>
> --
> --
> You received this message from the "vim_dev" maillist.
> Do not top-post! Type your reply below the text you are replying to.
> For more information, visit http://www.vim.org/maillist.php
>
> ---
> You received this message because you are subscribed to the Google Groups
> "vim_dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an

> email to ***@***.***

> To view this discussion visit
> https://groups.google.com/d/msgid/vim_dev/vim/vim/commit/1ff3e701e49c04162c1bd68b58fb6588dda89fe0/170351599%40github.com

> <https://groups.google.com/d/msgid/vim_dev/vim/vim/commit/1ff3e701e49c04162c1bd68b58fb6588dda89fe0/170351599%40github.com?utm_medium=email&utm_source=footer>
> .
>

—
Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/commit/1ff3e701e49c04162c1bd68b58fb6588dda89fe0/170422391@github.com>

[Maxim Kim]

Did you `git pull` ?

[Christian Brabandt]

On Do, 13 Nov 2025, Tony Mechelynck wrote:

> Patch 9.1.1905 ? I went over from Mercurial to git after patch 9.1.1896 plus two runtime changes, and "git status" never told me anything other than the following:
>
> On branch master
> Your branch is up to date with 'origin/master'.
>
> nothing to commit, working tree clean
>
> so if there exists a patch 9.1.1905 I'm missing at least nine patchlevels. Where are they ?

If you don't want to change your current checked out repo, use git
fetch. This fetches the latest information from the remote repo, without
touching it. git status should then tell you, you are behind.

Since I seem to remember you have some local changes (I suppose commited
on top of the checkout master branch), you can then update your local
branch and re-apply your changes on top of it using
git rebase origin/master

Thanks,
Christian
--
It'll be a nice world if they ever get it finished.

[vim-dev ML]

—
Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/commit/1ff3e701e49c04162c1bd68b58fb6588dda89fe0/170432864@github.com>

[Tony Mechelynck]

On Thu, Nov 13, 2025 at 9:12 AM vim-dev ML <vim-dev...@256bit.org> wrote:

On Do, 13 Nov 2025, Tony Mechelynck wrote:

> Patch 9.1.1905 ? I went over from Mercurial to git after patch 9.1.1896 plus two runtime changes, and "git status" never told me anything other than the following:
>
> On branch master
> Your branch is up to date with 'origin/master'.
>
> nothing to commit, working tree clean
>
> so if there exists a patch 9.1.1905 I'm missing at least nine patchlevels. Where are they ?

If you don't want to change your current checked out repo, use git
fetch. This fetches the latest information from the remote repo, without
touching it. git status should then tell you, you are behind.

I thought that "git status" would tell me whether or not I needed to pull. On Mercurial I would run "hg incoming" and it would tell me what, if anything, would be added to my repository if I pulled. Not wanting to run "git pull" every hour to have it tell me "Nothing to do" I thought that "git status" would tell me if there was anything on the remote which I needed to pull. Apparently it doesn't. So how do I ask git "What am I missing ?"

Since I seem to remember you have some local changes (I suppose commited
on top of the checkout master branch), you can then update your local
branch and re-apply your changes on top of it using
git rebase origin/master

I had local changes in my Mercurial clone but they were not important (one line in src/feature.h to enable +xterm_save) and I haven't brought them over to my git clone. All differences between my various shadow builds are defined by means of environment variables (set differently in one shell per shadow directory), which require no changes to the Vim distribution.

Thanks,
Christian

Best regards,

Tony. 

--
It'll be a nice world if they ever get it finished.

:-D

[vim-dev ML]

On Thu, Nov 13, 2025 at 9:12 AM vim-dev ML ***@***.***>

—
Reply to this email directly, view it on GitHub.

You are receiving this because you are subscribed to this thread.Message ID: <vim/vim/commit/1ff3e701e49c04162c1bd68b58fb6588dda89fe0/170437604@github.com>

[Christian Brabandt]

On Do, 13 Nov 2025, Tony Mechelynck wrote:

> I thought that "git status" would tell me whether or not I needed to
> pull. On Mercurial I would run "hg incoming" and it would tell me
> what, if anything, would be added to my repository if I pulled. Not
> wanting to run "git pull" every hour to have it tell me "Nothing to
> do" I thought that "git status" would tell me if there was anything on
> the remote which I needed to pull. Apparently it doesn't. So how do I
> ask git "What am I missing ?"

You need to fetch updates first, otherwise git status won't know about
it. You can do this via git fetch or git pull. The difference is, git
fetch won't touch your working/checked out tree, while git pull will
merge the new changes in. For that reason I find git fetch safer.

Once you have updated your remotes, git status should know about it and
tell you that you are "behind".

git log --oneline HEAD..origin/master

This would show you in a single line what commits you are missing in
your local tree. And git rebase origin/master will update your local
tree with the latest changes from the remote repository (and replay your
custom commits on top of it afterwards).

> Since I seem to remember you have some local changes (I suppose commited
> on top of the checkout master branch), you can then update your local
> branch and re-apply your changes on top of it using
> git rebase origin/master
>
>
> I had local changes in my Mercurial clone but they were not important
> (one line in src/feature.h to enable +xterm_save) and I haven't
> brought them over to my git clone. All differences between my various
> shadow builds are defined by means of environment variables (set
> differently in one shell per shadow directory), which require no
> changes to the Vim distribution.

In that case, you can just git pull and update your working tree without
worries and git log --oneline should tell you what changed.


Thanks,
Christian
--
Living in New York City gives people real incentives to want things that
nobody else wants.
-- Andy Warhol