Git-Bug

Git-Bug

[Klaus Ethgen]

[-- Attachment #1: Type: text/plain, Size: 2245 bytes --]

Hi,

since some versions I have the following troubles with git:

I use vcsh to manage my vim config files and pull/push them from one
machine to others. That was working great but now the push refuses to
work as it state the working tree is unclean even if it is clean:

   # on the server:
   ~> vcsh vim config receive.denyCurrentBranch
   updateInstead
   ~> vcsh vim config core.excludesfile
   .gitignore.d/vim
   ~> vcsh vim status
   Auf Branch master
   Ihr Branch ist auf demselben Stand wie 'origin/master'.

   nichts zu committen, Arbeitsverzeichnis unverändert

   # on the client:
   ~> vcsh vim status
   Auf Branch master
   Ihr Branch ist 3 Commits vor 'xxxx/master'.
     (benutzen Sie "git push", um lokale Commits zu publizieren)

   nichts zu committen, Arbeitsverzeichnis unverändert
   ~> vcsh vim push
   Objekte aufzählen: 10, fertig.
   Zähle Objekte: 100% (9/9), fertig.
   Delta-Kompression verwendet bis zu 2 Threads.
   Komprimiere Objekte: 100% (6/6), fertig.
   Schreibe Objekte: 100% (6/6), 821 Bytes | 821.00 KiB/s, fertig.
   Gesamt 6 (Delta 4), Wiederverwendet 0 (Delta 0), Pack wiederverwendet 0
   To xxxx:.config/vcsh/repo.d/vim.git
    ! [remote rejected] master -> master (Working directory has unstaged changes)
   error: Fehler beim Versenden einiger Referenzen nach 'xxxx:.config/vcsh/repo.d/vim.git'

`vcsh ... command` does the same ad `vcsh ... && git command`... vcsh is
a simple script that sets GIT_DIR to ~/.config/vcsh/repo.d/....git. vcsh
is used to manage config files in $HOME but not the full directory. In
this example, it manages .vimrc, .gvimrc, .vim/ and .exrc.

As you can see, there is no unstaged changes but git tell me there are.

I tried different things but failed to tell git that everything is clean
and that there are no unstaged changes.

Other vcsh trees are working well. I see no pattern why this one is not
working.

Regards
   Klaus

Ps. Please keep me in Cc as I am not subscribed to this list.
-- 
Klaus Ethgen                                       http://www.ethgen.ch/
pub  4096R/4E20AF1C 2011-05-16            Klaus Ethgen <Klaus@Ethgen.ch>
Fingerprint: 85D4 CA42 952C 949B 1753  62B3 79D0 B06F 4E20 AF1C

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 688 bytes --]

Re: Git-Bug

[brian m. carlson]

[-- Attachment #1: Type: text/plain, Size: 2219 bytes --]

On 2022-06-25 at 08:28:46, Klaus Ethgen wrote:
> Hi,
> 
> since some versions I have the following troubles with git:
> 
> I use vcsh to manage my vim config files and pull/push them from one
> machine to others. That was working great but now the push refuses to
> work as it state the working tree is unclean even if it is clean:
> 
>    # on the server:
>    ~> vcsh vim config receive.denyCurrentBranch
>    updateInstead
>    ~> vcsh vim config core.excludesfile
>    .gitignore.d/vim
>    ~> vcsh vim status
>    Auf Branch master
>    Ihr Branch ist auf demselben Stand wie 'origin/master'.
> 
>    nichts zu committen, Arbeitsverzeichnis unverändert
> 
>    # on the client:
>    ~> vcsh vim status
>    Auf Branch master
>    Ihr Branch ist 3 Commits vor 'xxxx/master'.
>      (benutzen Sie "git push", um lokale Commits zu publizieren)
> 
>    nichts zu committen, Arbeitsverzeichnis unverändert
>    ~> vcsh vim push
>    Objekte aufzählen: 10, fertig.
>    Zähle Objekte: 100% (9/9), fertig.
>    Delta-Kompression verwendet bis zu 2 Threads.
>    Komprimiere Objekte: 100% (6/6), fertig.
>    Schreibe Objekte: 100% (6/6), 821 Bytes | 821.00 KiB/s, fertig.
>    Gesamt 6 (Delta 4), Wiederverwendet 0 (Delta 0), Pack wiederverwendet 0
>    To xxxx:.config/vcsh/repo.d/vim.git
>     ! [remote rejected] master -> master (Working directory has unstaged changes)
>    error: Fehler beim Versenden einiger Referenzen nach 'xxxx:.config/vcsh/repo.d/vim.git'
> 
> `vcsh ... command` does the same ad `vcsh ... && git command`... vcsh is
> a simple script that sets GIT_DIR to ~/.config/vcsh/repo.d/....git. vcsh
> is used to manage config files in $HOME but not the full directory. In
> this example, it manages .vimrc, .gvimrc, .vim/ and .exrc.
> 
> As you can see, there is no unstaged changes but git tell me there are.
> 
> I tried different things but failed to tell git that everything is clean
> and that there are no unstaged changes.

Do you have files that would be unstaged after you pushed?  Are there
ignored files in that directory that would conflict with what you've
pushed?
-- 
brian m. carlson (he/him or they/them)
Toronto, Ontario, CA

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 263 bytes --]