Package: git
Version: 1:1.7.9.1-1
Severity: normal
While interactively rebasing, I have twice run into this (same repo,
different rebase steps, different ambiguous hashes):
[...]
$ git commit -aC1dafcb6
[detached HEAD 7caed94] .crawlrc: leverage settings/ from upstream.
Author: Trent W. Buck <trentb...@gmail.com>
1 files changed, 26 insertions(+), 65 deletions(-)
$ git show
$ git rebase --continue
[detached HEAD ebd32a8] .crawlrc: switch pickup logic from a whitelist to a
blacklist.
Author: Trent W. Buck <trentb...@gmail.com>
1 files changed, 127 insertions(+), 34 deletions(-)
error: short SHA1 dccb2c5 is ambiguous.
fatal: Needed a single revision
Invalid commit name: dccb2c5
$
Freenode's #git suggested I increase core.abbrev. I did so in
.gitconfig, and OTHER commands see that it is now 16, but rebase -i
ignores me:
$ git config core.abbrev
16
$ git log -1 --oneline
d41f26287596e06e debian/*: draft replacement for equivs/equivs.ctl.
$ git rebase -s patience -i d7551cc
95570
1p
pick 0580c54 Initial import.
1,$d
wq
0
Nothing to do
$
Maybe I've misunderstood what's supposed to happen here, but I was
expecting all the hashes in .git/rebase-merge/git-rebase-todo to be 16
xdigits long.
(Ideally I'd like to not get the amibguous hashes in the first place,
but ICBF tracking down the issue there.)
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.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
Versions of packages git depends on:
ii git-man 1:1.7.9.1-1
ii libc6 2.13-27
ii libcurl3-gnutls 7.24.0-1
ii liberror-perl 0.17-1
ii libexpat1 2.0.1-7.2
ii perl-modules 5.14.2-9
ii zlib1g 1:1.2.6.dfsg-2
Versions of packages git recommends:
ii less 444-2
ii openssh-client [ssh-client] 1:5.9p1-3
ii patch 2.6.1-3
ii rsync 3.0.9-1
Versions of packages git suggests:
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-svn <none>
pn gitk <none>
pn gitweb <none>
-- no debconf information
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
