Package: git Version: 1:1.8.5.3-1 Severity: normal Dear maintainer,
For some reason, I sometime want to merge in the current branch, another branch that is on the same commit as the current one. When this branch is in second position on the command line, then it forget to merge the first branch. Here is a list of commands that reproduce the bug: ------------------------------------------------- git init touch emptyfile.txt git add emptyfile.txt git commit -m 'Added an empty file' emptyfile.txt git branch noopbranch git checkout -b foobranch master echo foo > foo.txt git add foo.txt git commit -m 'Added foo file' foo.txt git checkout -b barbranch master echo bar > bar.txt git add bar.txt git commit -m 'Added bar file' bar.txt git checkout -b bazbranch master echo baz > baz.txt git add baz.txt git commit -m 'Added baz file' baz.txt git checkout -b merge master git merge --no-edit foobranch noopbranch barbranch bazbranch git log --graph --oneline --decorate --all ------------------------------------------------- It creates a commit on branch master. A noopbranch on the same commit as master. Then 3 branches with their own modifications. And finally, it try to merge all 4 branches into a "merge" branch. The last command show the DAG of commits, and the branch foobranch is clearly missing the in merge commit. Moreover, the automatic commit message is just 'foobranch' instead of the traditional merge message. It looks like a bug in the arguments management. Regards, Celelibi -- System Information: Debian Release: jessie/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental') Architecture: i386 (x86_64) Kernel: Linux 3.10.11 (SMP w/2 CPU cores; PREEMPT) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages git depends on: ii git-man 1:1.8.5.3-1 ii libc6 2.17-97 ii libcurl3-gnutls 7.35.0-1 ii liberror-perl 0.17-1.1 ii libexpat1 2.1.0-4 ii libpcre3 1:8.31-2 ii perl-modules 5.18.2-2 ii zlib1g 1:1.2.8.dfsg-1 Versions of packages git recommends: ii less 458-2 ii openssh-client [ssh-client] 1:6.4p1-2 ii patch 2.7.1-4 ii rsync 3.1.0-2 Versions of packages git suggests: ii gettext-base 0.18.3.2-1 pn git-arch <none> pn git-bzr <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:1.8.5.3-1 pn git-gui <none> pn git-mediawiki <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
