Package: git Version: 1:2.6.4-1 Severity: normal File: /usr/lib/git-core/git-sh-prompt
I recently did a git svn clone of the Planet Debian SVN and I noticed that the normal upstream indicator in the git part of my $PS1 was not working properly. The issue appears to be that the code decides that the upstream is trunk instead of origin/trunk. trunk gives an error from git rev-list but origin/trunk does not. It works for normal git svn clone because there the remote branch is just named git-svn with no origin/ prefix. I'm using the below settings for my bash git PS1. In case you need a small repo to reproduce this with, try neomis. It still works with some of my old repos because the remote branch is just trunk instead of origin/trunk, so I think git-svn changed this. http://neomis.googlecode.com/svn pabs@chianamo ~ $ git svn clone --stdlayout svn+ssh://svn.debian.org/svn/planet-debian ... pabs@chianamo ~ $ cd planet-debian pabs@chianamo ~/planet-debian (master) $ cd .. pabs@chianamo ~ $ git svn clone svn+ssh://svn.debian.org/svn/secure-testing ... pabs@chianamo ~ $ cd secure-testing pabs@chianamo ~/secure-testing (master=) $ cd .. pabs@chianamo ~ $ grep GIT_PS1 ~/.bash.d/git export GIT_PS1_SHOWDIRTYSTATE=true export GIT_PS1_SHOWSTASHSTATE=true export GIT_PS1_SHOWUNTRACKEDFILES=true export GIT_PS1_SHOWUPSTREAM=auto export GIT_PS1_SHOWUPSTREAM=name export GIT_PS1_SHOWCOLORHINTS=true export GIT_PS1_DESCRIBE_STYLE=branch -- System Information: Debian Release: stretch/sid APT prefers testing APT policy: (900, 'testing'), (860, 'testing-proposed-updates'), (850, 'buildd-testing-proposed-updates'), (800, 'unstable'), (790, 'buildd-unstable'), (700, 'experimental'), (690, 'buildd-experimental'), (500, 'unstable-debug'), (1, 'experimental-debug') Architecture: amd64 (x86_64) Kernel: Linux 4.3.0-1-amd64 (SMP w/4 CPU cores) Locale: LANG=en_AU.utf8, LC_CTYPE=en_AU.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages git depends on: ii git-man 1:2.6.4-1 ii libc6 2.21-6 ii libcurl3-gnutls 7.46.0-1 ii liberror-perl 0.17-1.2 ii libexpat1 2.1.0-7 ii libpcre3 2:8.38-1 ii perl-modules-5.22 [perl-modules] 5.22.1-3 ii zlib1g 1:1.2.8.dfsg-2+b1 Versions of packages git recommends: ii less 458-3+b1 ii openssh-client [ssh-client] 1:7.1p1-6 ii patch 2.7.5-1 ii rsync 3.1.1-3 Versions of packages git suggests: ii gettext-base 0.19.7-2 pn git-arch <none> pn git-cvs <none> pn git-daemon-run | git-daemon-sysvinit <none> pn git-doc <none> pn git-el <none> ii git-email 1:2.6.4-1 ii git-gui 1:2.6.4-1 ii git-mediawiki 1:2.6.4-1 ii git-svn 1:2.6.4-1 ii gitk 1:2.6.4-1 pn gitweb <none> -- no debconf information -- bye, pabs https://wiki.debian.org/PaulWise
signature.asc
Description: This is a digitally signed message part
