Public bug reported:

Binary package hint: git-buildpackage

I've rebuilt 0.5.4 with 88afa6117ea4dd6b5d8fd88936afffb11c25ec47
reverted ("Pass --multimaint-merge on to dch").  The devscripts package
in lucid is not recent enough.  As of today, I'm (still) having the
following issue with git-import-dsc(s).

TEST CASE:
$ cd /tmp
$ for i in 1 2 3 4 ; do dget -ud 
http://ftp.de.debian.org/debian/pool/main/i/isdnutils/isdnutils_3.9.20060704+dfsg.1-$i.dsc;done
$ git-import-dscs isdnutils_3.9.20060704+dfsg.1*dsc
$ cd isdnutils
$ git log -p

If you look at the history with "git log -p" or qgit you will realize
that git-import-dsc uses merges from the upstream branch and HEAD every
(!) time instead of just a simple commit when possible.  This results in
an overly complex history and breaks "git log -p".

** Affects: git-buildpackage (Ubuntu)
     Importance: Undecided
         Status: New

** Description changed:

  Binary package hint: git-buildpackage
  
  I've rebuilt 0.5.4 with 88afa6117ea4dd6b5d8fd88936afffb11c25ec47
  reverted ("Pass --multimaint-merge on to dch").  The devscripts package
  in lucid is not recent enough.  As of today, I'm (still) having the
  following issue with git-import-dsc(s).
  
  TEST CASE:
  $ cd /tmp
  $ for i in 1 2 3 4 ; do dget -ud 
http://ftp.de.debian.org/debian/pool/main/i/isdnutils/isdnutils_3.9.20060704+dfsg.1-$i.dsc;done
- $ git-import-dscs 
  $ git-import-dscs isdnutils_3.9.20060704+dfsg.1*dsc
  $ cd isdnutils
  $ git log -p
  
  If you look at the history with "git log -p" or qgit you will realize
  that git-import-dsc uses merges from the upstream branch and HEAD every
  (!) time instead of just a simple commit when possible.  This results in
  an overly complex history and breaks "git log -p".

-- 
git-import-dscs creates merges instead of simple commits
https://bugs.launchpad.net/bugs/636862
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.

-- 
ubuntu-bugs mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs

Reply via email to