Instead of returning and error status or calling die, use an assert
statement to guard against callers who don't call the functions with
sane arguments. This situation is hence treated as an inherent bug in
the program, rather than a runtime error.
Mentored-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx>
---
builtin/revert.c | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index f697e66..8102d77 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -123,8 +123,7 @@ static int get_message(const char *raw_message, struct commit_message *out)
int abbrev_len, subject_len;
char *q;
- if (!raw_message)
- return -1;
+ assert(raw_message);
encoding = get_encoding(raw_message);
if (!encoding)
encoding = "UTF-8";
@@ -167,9 +166,7 @@ static char *get_encoding(const char *message)
{
const char *p = message, *eol;
- if (!p)
- die (_("Could not read commit message of %s"),
- sha1_to_hex(commit->object.sha1));
+ assert(p);
while (*p && *p != '\n') {
for (eol = p + 1; *eol && *eol != '\n'; eol++)
; /* do nothing */
@@ -444,9 +441,7 @@ static int do_pick_commit(void)
die(_("%s: cannot parse parent commit %s"),
me, sha1_to_hex(parent->object.sha1));
- if (get_message(commit->buffer, &msg) != 0)
- die(_("Cannot get commit message for %s"),
- sha1_to_hex(commit->object.sha1));
+ get_message(commit->buffer, &msg);
/*
* "commit" is an existing commit. We would want to apply
--
1.7.5.GIT
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html