"git merge -s ours --no-commit FETCH_HEAD" segfaults with NULL-dereference
Bug #1670619 reported by
Roman Fiedler
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
git (Ubuntu) |
New
|
Undecided
|
Unassigned |
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://
100 /var/lib/
To post a comment you must log in.
Bug seems to be fixed in newer version of git, see chat colabti. org/irclogger/ irclogger_ log/git? date=2017- 03-07
http://
Current trunk reports:
"fatal: FETCH_HEAD - not something we can merge"