[pkg-fso-maint] Bug#518008: git-buildpackage: branch diversion results in uncommitted changes

[Luca Capello]

Package: git-buildpackage
Version: 0.4.49
Severity: normal
User: pkg-fso-maint at lists.alioth.debian.org
Usertags: package-creation

Hello,

I am an happy git-buildpackage user, but since this morning I am
experiencing a strange bug:
=====
luca at gismo:~/linux-2.6-openmoko(git)[debian]$ git-buildpackage
You have uncommitted changes in your source tree:
# On branch debian
# Your branch and 'origin/andy-tracking' have diverged,
# and have 363 and 43986 different commit(s) each, respectively.
#
nothing to commit (working directory clean)

Use --git-ignore-new to ignore.
luca at gismo:~/linux-2.6-openmoko(git)[debian]$
=====

The upstream and Debian repositories are available at [1] and [2],
respectively.  If needed, I can provide a tarball of my repository.

A fresh checkout from the Debian repository does not shown this problem.
I guess this was caused by the fact that the debian branch firstly
tracked the origin/stable one and then I moved it to
origin/andy-tracking, manually changing .git/config.  Because there were
some conflicts while merging origin/andy-tracking into debian, I do a
"manual" merge, as explained at [3].

I will use the --git-ignore-new option in the meantime, but this is clear
a main problem.

Thx, bye,
Gismo / Luca

Footnotes: 
[1] http://git.openmoko.org/?p=kernel.git;a=summary
[2] http://git.debian.org/?p=pkg-fso/linux-2.6-openmoko.git;a=summary
[3] http://lists.alioth.debian.org/pipermail/pkg-fso-maint/2009-February/000504.html

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (990, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.28-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages git-buildpackage depends on:
ii  devscripts                   2.10.46     scripts to make the life of a Debi
ii  git-core                     1:1.6.1.3-2 fast, scalable, distributed revisi
ii  python                       2.5.4-2     An interactive high-level object-o
ii  python-dateutil              1.4.1-3     powerful extensions to the standar
ii  python-support               0.8.7       automated rebuilding support for P

git-buildpackage recommends no packages.

Versions of packages git-buildpackage suggests:
pn  git-load-dirs                 <none>     (no description available)
ii  pristine-tar                  0.21       regenerate pristine tarballs

-- no debconf information
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 314 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/pkg-fso-maint/attachments/20090303/4d6b8c7a/attachment.pgp