Code

refuse to merge during a merge
authorClemens Buchacher <drizzd@aon.at>
Mon, 1 Jun 2009 09:20:56 +0000 (11:20 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Jun 2009 02:42:17 +0000 (19:42 -0700)
commitc8c562a238071843c64ea0f3a2c85481606da379
treec6a892cba320d30eb71b10c96a11c3d77ff731a6
parent6a01554e6350123c78de805d820e90f1c56e5fdc
refuse to merge during a merge

The following is an easy mistake to make for users coming from version
control systems with an "update and commit"-style workflow.

        1. git pull
        2. resolve conflicts
        3. git pull

Step 3 overrides MERGE_HEAD, starting a new merge with dirty index.
IOW, probably not what the user intended. Instead, refuse to merge
again if a merge is in progress.

Reported-by: Dave Olszewski <cxreg@pobox.com>
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-merge.c
t/t3030-merge-recursive.sh