[Bug 1670619] [NEW] "git merge -s ours --no-commit FETCH_HEAD" segfaults with NULL-dereference

[Roman Fiedler]

Public bug reported:

Following steps cause a segfault on 32/64bit Ubuntu Xenial:

mkdir x y
git init x
git init y
cd x
git remote add y ../y
git fetch y
git merge -s ours --no-commit FETCH_HEAD

$ lsb_release -rd
Description:    Ubuntu 16.04.2 LTS
Release:        16.04
$ apt-cache policy git
git:
  Installed: 1:2.7.4-0ubuntu1
  Candidate: 1:2.7.4-0ubuntu1
  Version table:
 *** 1:2.7.4-0ubuntu1 500
        500 http://archive.ubuntu.com/ubuntu xenial/main amd64 Packages
        100 /var/lib/dpkg/status

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

-- 
You received this bug notification because you are a member of Ubuntu
Foundations Bugs, which is subscribed to git in Ubuntu.
https://bugs.launchpad.net/bugs/1670619

Title:
  "git merge -s ours --no-commit FETCH_HEAD" segfaults with NULL-
  dereference

Status in git package in Ubuntu:
  New

Bug description:
  Following steps cause a segfault on 32/64bit Ubuntu Xenial:

  mkdir x y
  git init x
  git init y
  cd x
  git remote add y ../y
  git fetch y
  git merge -s ours --no-commit FETCH_HEAD

  $ lsb_release -rd
  Description:    Ubuntu 16.04.2 LTS
  Release:        16.04
  $ apt-cache policy git
  git:
    Installed: 1:2.7.4-0ubuntu1
    Candidate: 1:2.7.4-0ubuntu1
    Version table:
   *** 1:2.7.4-0ubuntu1 500
          500 http://archive.ubuntu.com/ubuntu xenial/main amd64 Packages
          100 /var/lib/dpkg/status

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/git/+bug/1670619/+subscriptions