Re: [lmi] konsole clipboard stopped working (fixed)

[Greg Chicares]

On 2017-11-02 17:23, Vadim Zeitlin wrote:
> On Thu, 2 Nov 2017 15:44:02 +0000 Greg Chicares <address@hidden> wrote:
[...]
> GC> -svn status --show-updates
> GC> -svn update
> GC> +git remote -v update
> GC> +git pull
> GC> 
> GC> Back in svn days, I ran
> GC>   svn status --show-updates
> 
>  I don't remember what did this variant of "svn status" do exactly, but I'm

It indicates whether or not the local working copy and the server
are synchronized.

http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.status.html
| Print the status of working copy files and directories. With no
| arguments, it prints only locally modified items (no repository
| access). With --show-updates (-u), it adds working revision and
| server out-of-date information.

> almost sure that "git remote update" doesn't do the same thing as it
> doesn't actually show anything.

Let's test it. Before running 'git pull' to synchronize my local mirror
to savannah master, it says:

/opt/lmi/free/src/lmi[0]$git remote -v update
Fetching origin
Looking up git.savannah.nongnu.org ... done.
Connecting to git.savannah.nongnu.org (port 9418) ... 208.118.235.201 done.
remote: Counting objects: 11, done.
remote: Compressing objects: 100% (10/10), done.
remote: Total 11 (delta 8), reused 0 (delta 0)
Unpacking objects: 100% (11/11), done.
>From git://git.savannah.nongnu.org/lmi
   3df3e622..ff7a3f5b  master     -> origin/master

Running it again immediately produces different output:

/opt/lmi/free/src/lmi[0]$git remote -v update
Fetching origin
Looking up git.savannah.nongnu.org ... done.
Connecting to git.savannah.nongnu.org (port 9418) ... 208.118.235.201 done.
>From git://git.savannah.nongnu.org/lmi
 = [up to date]        master     -> origin/master

....which isn't exactly what I wanted (or what I believe the svn
command did). I want a const accessor that inquires whether
git-pull would change anything, but without actually changing
anything yet.

> Of course, it absolutely doesn't hurt to
> run it in any case, although personally I prefer "git fetch --all" (which
> is its exact synonym AFAICS) that I find more clear.

I'm guessing that what I really want is
  git fetch --all --dry-run
but of course that does nothing at the moment because of the
mutating command I had just run above.

However, I've made a local branch and haven't yet pushed it to
savannah, so let me push it now (with immense trepidation stemming
from years of using svn, where mistakes cannot be undone without
privileged access to the central server):

/opt/lmi/src/lmi[0]$git push origin gwc-no-xslfo
Enter passphrase for key '/home/greg/.ssh/id_rsa': 
Total 0 (delta 0), reused 0 (delta 0)
remote: Sending notification emails to: address@hidden
To git.sv.gnu.org:/srv/git/lmi.git
 * [new branch]          gwc-no-xslfo -> gwc-no-xslfo

And now (switching from my working copy to my mirror directory,
as the $PROMPT indicates):

/opt/lmi/free/src/lmi[0]$git fetch --all --dry-run
Fetching origin
>From git://git.savannah.nongnu.org/lmi
 * [new branch]        gwc-no-xslfo -> origin/gwc-no-xslfo

The moment of truth: is that inspection command reentrant?

/opt/lmi/free/src/lmi[0]$git fetch --all --dry-run
Fetching origin
>From git://git.savannah.nongnu.org/lmi
 * [new branch]        gwc-no-xslfo -> origin/gwc-no-xslfo

Yes, it is, so that's the command I want.

Now, when I git-pull, I get the 3df..ff7 changes that
'git remote update' had indicated:

/opt/lmi/free/src/lmi[0]$git pull                                               
              
>From git://git.savannah.nongnu.org/lmi
 * [new branch]        gwc-no-xslfo -> origin/gwc-no-xslfo
Updating 3df3e622..ff7a3f5b
Fast-forward
 gwc/develop1.txt      |  5 ++---
 tabs/1/startup_script |  2 +-
 tabs/konsole_tabs     | 10 +++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

And now I want to confirm that treating the repository as linear
still works--e.g., that if Kim uses only 'git pull', she won't
get my branch if she doesn't ask for it:

/opt/lmi/free/src/lmi[0]$git branch
* master

Looks good: my branch is available, but not pulled by default;
whereas, in my working copy, I see the branches I want:

/opt/lmi/src/lmi[0]$git branch                  
  gwc-no-xslfo
* master
  vz-no-xslfo