OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a274e0a
)
am: fix filename in safe_to_abort() error message
author
Stephan Beyer
<s-beyer@gmx.net>
Wed, 7 Dec 2016 21:51:29 +0000
(22:51 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 8 Dec 2016 17:09:34 +0000
(09:09 -0800)
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/am.c
patch
|
blob
|
history
diff --git
a/builtin/am.c
b/builtin/am.c
index
6981f42
..
7cf40e6
100644
(file)
--- a/
builtin/am.c
+++ b/
builtin/am.c
@@
-2124,7
+2124,7
@@
static int safe_to_abort(const struct am_state *state)
if (read_state_file(&sb, state, "abort-safety", 1) > 0) {
if (get_oid_hex(sb.buf, &abort_safety))
- die(_("could not parse %s"), am_path(state, "abort
_
safety"));
+ die(_("could not parse %s"), am_path(state, "abort
-
safety"));
} else
oidclr(&abort_safety);