| commit | 5b3270817712e8eedb468e906cb1042a5a311ad4 | |
| author | Thomas Rast <trast@student.ethz.ch> | |
| Sun, 22 Aug 2010 21:06:29 +0000 (22 23:06 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Aug 2010 18:30:21 +0000 (25 11:30 -0700) | ||
| tree | 86f1612ee14c5b38e4b493ffb7888d442792f5bb | treesnapshot (tar.gz zip) |
| parent | d599e0484f8ebac8cc50e9557a4c3d246826843d | commitdiff |
Exhibit merge bug that clobbers index&WT
Running git-merge on an unborn branch is supposed to do an index-level
merge with the other side, and then update the branch name there. In
the common case where the index was empty at the start, this makes
'git pull otherrepo branch' a convenient way to populate the history
after 'git init'.
However, if the index was *not* empty, git-merge silently discards
*both index and worktree* copies of all files that were tracked,
leading to data loss. Exhibit this bug.
Reported-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Running git-merge on an unborn branch is supposed to do an index-level
merge with the other side, and then update the branch name there. In
the common case where the index was empty at the start, this makes
'git pull otherrepo branch' a convenient way to populate the history
after 'git init'.
However, if the index was *not* empty, git-merge silently discards
*both index and worktree* copies of all files that were tracked,
leading to data loss. Exhibit this bug.
Reported-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7607-merge-overwrite.sh | diffblobblamehistory |