git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 001d116 61e0eb9)
Merge branch 'rr/am-quit-empty-then-abort-fix'
authorJunio C Hamano <redacted>
Mon, 24 Jun 2013 20:49:00 +0000 (13:49 -0700)
committerJunio C Hamano <redacted>
Mon, 24 Jun 2013 20:49:00 +0000 (13:49 -0700)
commit76689ab83b65636a01dd34ecfb9c1382aa6e959a
treea2ea05a87eb3cf47128e914e2bcd2467620de073tree | snapshot
parent001d1160541a6dcfceb82a0a900478e315a129ebcommit | diff
parent61e0eb9de268cab90ea2563957b4c74c77e82b48commit | diff
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
git clone https://git.99rst.org/PROJECT