From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 24 Jun 2013 20:49:00 +0000 (-0700)
Subject: Merge branch 'rr/am-quit-empty-then-abort-fix'
X-Git-Tag: v1.8.4-rc0~129
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76689ab83b65636a01dd34ecfb9c1382aa6e959a;p=thirdparty%2Fgit.git

Merge branch 'rr/am-quit-empty-then-abort-fix'

Recent "rebase --autostash" update made it impossible to recover
with "git am --abort" from a repository where "git am" without mbox
was run by mistake and then was killed with "^C".

* rr/am-quit-empty-then-abort-fix:
  t/am: use test_path_is_missing() where appropriate
  am: handle stray $dotest directory
---

76689ab83b65636a01dd34ecfb9c1382aa6e959a