sequencer: die on config error when saving replay opts

diff --git a/config.c b/config.c
index 248a21ab94116fabba95e01a8571a458efa99f76..856f7d34c7efcce3005dd40fcfb7ac93048adfdc 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1831,11 +1831,22 @@ int git_config_set_in_file(const char *config_filename,
        return git_config_set_multivar_in_file(config_filename, key, value, NULL, 0);
 }
 
+void git_config_set_in_file_or_die(const char *config_filename,
+                       const char *key, const char *value)
+{
+       git_config_set_multivar_in_file_or_die(config_filename, key, value, NULL, 0);
+}
+
 int git_config_set(const char *key, const char *value)
 {
        return git_config_set_multivar(key, value, NULL, 0);
 }
 
+void git_config_set_or_die(const char *key, const char *value)
+{
+       git_config_set_multivar_or_die(key, value, NULL, 0);
+}
+
 /*
  * Auxiliary function to sanity-check and split the key into the section
  * identifier and variable name.
@@ -2144,7 +2155,8 @@ int git_config_set_multivar_in_file(const char *config_filename,
        }
 
        if (commit_lock_file(lock) < 0) {
-               error("could not commit config file %s", config_filename);
+               error("could not write config file %s: %s", config_filename,
+                     strerror(errno));
                ret = CONFIG_NO_WRITE;
                lock = NULL;
                goto out_free;
@@ -2178,6 +2190,15 @@ int git_config_set_multivar_in_file(const char *config_filename,
 
 }
 
+void git_config_set_multivar_in_file_or_die(const char *config_filename,
+                               const char *key, const char *value,
+                               const char *value_regex, int multi_replace)
+{
+       if (git_config_set_multivar_in_file(config_filename, key, value,
+                                           value_regex, multi_replace) < 0)
+               die(_("Could not set '%s' to '%s'"), key, value);
+}
+
 int git_config_set_multivar(const char *key, const char *value,
                        const char *value_regex, int multi_replace)
 {
@@ -2185,6 +2206,13 @@ int git_config_set_multivar(const char *key, const char *value,
                                               multi_replace);
 }
 
+void git_config_set_multivar_or_die(const char *key, const char *value,
+                       const char *value_regex, int multi_replace)
+{
+       git_config_set_multivar_in_file_or_die(NULL, key, value, value_regex,
+                                              multi_replace);
+}
+
 static int section_name_match (const char *buf, const char *name)
 {
        int i = 0, j = 0, dot = 0;
@@ -2330,7 +2358,8 @@ int git_config_rename_section_in_file(const char *config_filename,
        fclose(config_file);
 unlock_and_out:
        if (commit_lock_file(lock) < 0)
-               ret = error("could not commit config file %s", config_filename);
+               ret = error("could not write config file %s: %s",
+                           config_filename, strerror(errno));
 out:
        free(filename_buf);
        return ret;