Package: git Version: 1:2.7.0~rc3+next.20151228-1 Severity: normal Tags: upstream
Dear Maintainer, 'git cherry-pick -n' doesn't set CHERRY_PICK_HEAD: % r=$(mktemp -d) % git init $r % cd $r % echo foo > foo % git add foo % git commit -m 'base' % git checkout -b feature % echo feature >> foo % git commit -am 'theirs' % git checkout master % echo master >> foo % git commit -am 'mine' % git cherry-pick -n feature % git rev-parse CHERRY_PICK_HEAD > /dev/null fatal: ambiguous argument 'CHERRY_PICK_HEAD': unknown revision or path not in the working tree. This is similar to #762488 which is about 'rebase -i'. Background: in zsh's vcs_info, we use CHERRY_PICK_HEAD to show information about the patch-being-applied in the prompt, and I'd like that information to be shown for conflicts in -n mode too. Cheers, Daniel -- System Information: Debian Release: stretch/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 4.3.0-1-amd64 (SMP w/1 CPU core) Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (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.7.0~rc3+next.20151228-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-5 ii patch 2.7.5-1 ii rsync 3.1.1-3 Versions of packages git suggests: ii gettext-base 0.19.7-1 pn git-arch <none> pn git-cvs <none> pn git-daemon-run | git-daemon-sysvinit <none> pn git-doc <none> pn git-el <none> pn git-email <none> pn git-gui <none> pn git-mediawiki <none> pn git-svn <none> pn gitk <none> pn gitweb <none> -- no debconf information
