merge-recursive: fix numerous argument alignment issues

Various refactorings throughout the code have left lots of alignment
issues that were driving me crazy; fix them.

Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/merge-recursive.c b/merge-recursive.c
index 921f8e2d2d38c327170c72c0831c70c4d0cead9c..09c249b93e45e197513f55d8a206535ecf89d750 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -309,8 +309,8 @@ static void output_commit_title(struct merge_options *o, struct commit *commit)
 }
 
 static int add_cacheinfo(struct merge_options *o,
 }
 
 static int add_cacheinfo(struct merge_options *o,

-               unsigned int mode, const struct object_id *oid,
-               const char *path, int stage, int refresh, int options)
+                        unsigned int mode, const struct object_id *oid,
+                        const char *path, int stage, int refresh, int options)

 {
        struct cache_entry *ce;
        int ret;
 {
        struct cache_entry *ce;
        int ret;


@@ -417,8 +417,8 @@ struct tree *write_tree_from_memory(struct merge_options *o)
 }
 
 static int save_files_dirs(const struct object_id *oid,
 }
 
 static int save_files_dirs(const struct object_id *oid,

-               struct strbuf *base, const char *path,
-               unsigned int mode, int stage, void *context)
+                          struct strbuf *base, const char *path,
+                          unsigned int mode, int stage, void *context)

 {
        struct path_hashmap_entry *entry;
        int baselen = base->len;
 {
        struct path_hashmap_entry *entry;
        int baselen = base->len;


@@ -913,7 +913,7 @@ static int make_room_for_path(struct merge_options *o, const char *path)
         */
        if (would_lose_untracked(path))
                return err(o, _("refusing to lose untracked file at '%s'"),
         */
        if (would_lose_untracked(path))
                return err(o, _("refusing to lose untracked file at '%s'"),

-                            path);
+                          path);

 
        /* Successful unlink is good.. */
        if (!unlink(path))
 
        /* Successful unlink is good.. */
        if (!unlink(path))


@@ -992,7 +992,7 @@ static int update_file_flags(struct merge_options *o,
                        unlink(path);
                        if (symlink(lnk, path))
                                ret = err(o, _("failed to symlink '%s': %s"),
                        unlink(path);
                        if (symlink(lnk, path))
                                ret = err(o, _("failed to symlink '%s': %s"),

-                                       path, strerror(errno));
+                                         path, strerror(errno));

                        free(lnk);
                } else
                        ret = err(o,
                        free(lnk);
                } else
                        ret = err(o,


@@ -1090,7 +1090,7 @@ static int merge_3way(struct merge_options *o,
 }
 
 static int find_first_merges(struct object_array *result, const char *path,
 }
 
 static int find_first_merges(struct object_array *result, const char *path,

-               struct commit *a, struct commit *b)
+                            struct commit *a, struct commit *b)

 {
        int i, j;
        struct object_array merges = OBJECT_ARRAY_INIT;
 {
        int i, j;
        struct object_array merges = OBJECT_ARRAY_INIT;


@@ -1108,7 +1108,7 @@ static int find_first_merges(struct object_array *result, const char *path,
 
        /* get all revisions that merge commit a */
        xsnprintf(merged_revision, sizeof(merged_revision), "^%s",
 
        /* get all revisions that merge commit a */
        xsnprintf(merged_revision, sizeof(merged_revision), "^%s",

-                       oid_to_hex(&a->object.oid));
+                 oid_to_hex(&a->object.oid));

        init_revisions(&revs, NULL);
        rev_opts.submodule = path;
        /* FIXME: can't handle linked worktrees in submodules yet */
        init_revisions(&revs, NULL);
        rev_opts.submodule = path;
        /* FIXME: can't handle linked worktrees in submodules yet */


@@ -1250,12 +1250,12 @@ static int merge_submodule(struct merge_options *o,
                output(o, 2, _("Found a possible merge resolution for the submodule:\n"));
                print_commit((struct commit *) merges.objects[0].item);
                output(o, 2, _(
                output(o, 2, _("Found a possible merge resolution for the submodule:\n"));
                print_commit((struct commit *) merges.objects[0].item);
                output(o, 2, _(

-                       "If this is correct simply add it to the index "
-                       "for example\n"
-                       "by using:\n\n"
-                       "  git update-index --cacheinfo 160000 %s \"%s\"\n\n"
-                       "which will accept this suggestion.\n"),
-                       oid_to_hex(&merges.objects[0].item->oid), path);
+                      "If this is correct simply add it to the index "
+                      "for example\n"
+                      "by using:\n\n"
+                      "  git update-index --cacheinfo 160000 %s \"%s\"\n\n"
+                      "which will accept this suggestion.\n"),
+                      oid_to_hex(&merges.objects[0].item->oid), path);

                break;
 
        default:
                break;
 
        default:


@@ -1332,10 +1332,10 @@ static int merge_file_1(struct merge_options *o,
                        result->clean = (merge_status == 0);
                } else if (S_ISGITLINK(a->mode)) {
                        result->clean = merge_submodule(o, &result->oid,
                        result->clean = (merge_status == 0);
                } else if (S_ISGITLINK(a->mode)) {
                        result->clean = merge_submodule(o, &result->oid,

-                                                      one->path,
-                                                      &one->oid,
-                                                      &a->oid,
-                                                      &b->oid);
+                                                       one->path,
+                                                       &one->oid,
+                                                       &a->oid,
+                                                       &b->oid);

                } else if (S_ISLNK(a->mode)) {
                        switch (o->recursive_variant) {
                        case MERGE_RECURSIVE_NORMAL:
                } else if (S_ISLNK(a->mode)) {
                        switch (o->recursive_variant) {
                        case MERGE_RECURSIVE_NORMAL:


@@ -1443,13 +1443,13 @@ static int conflict_rename_dir(struct merge_options *o,
 }
 
 static int handle_change_delete(struct merge_options *o,
 }
 
 static int handle_change_delete(struct merge_options *o,

-                                const char *path, const char *old_path,
-                                const struct object_id *o_oid, int o_mode,
-                                const struct object_id *changed_oid,
-                                int changed_mode,
-                                const char *change_branch,
-                                const char *delete_branch,
-                                const char *change, const char *change_past)
+                               const char *path, const char *old_path,
+                               const struct object_id *o_oid, int o_mode,
+                               const struct object_id *changed_oid,
+                               int changed_mode,
+                               const char *change_branch,
+                               const char *delete_branch,
+                               const char *change, const char *change_past)

 {
        char *alt_path = NULL;
        const char *update_path = path;
 {
        char *alt_path = NULL;
        const char *update_path = path;


@@ -1510,9 +1510,9 @@ static int handle_change_delete(struct merge_options *o,
 }
 
 static int conflict_rename_delete(struct merge_options *o,
 }
 
 static int conflict_rename_delete(struct merge_options *o,

-                                  struct diff_filepair *pair,
-                                  const char *rename_branch,
-                                  const char *delete_branch)
+                                 struct diff_filepair *pair,
+                                 const char *rename_branch,
+                                 const char *delete_branch)

 {
        const struct diff_filespec *orig = pair->one;
        const struct diff_filespec *dest = pair->two;
 {
        const struct diff_filespec *orig = pair->one;
        const struct diff_filespec *dest = pair->two;


@@ -1615,7 +1615,7 @@ static int handle_file(struct merge_options *o,
 }
 
 static int conflict_rename_rename_1to2(struct merge_options *o,
 }
 
 static int conflict_rename_rename_1to2(struct merge_options *o,

-                                       struct rename_conflict_info *ci)
+                                      struct rename_conflict_info *ci)

 {
        /* One file was renamed in both branches, but to different names. */
        struct diff_filespec *one = ci->pair1->one;
 {
        /* One file was renamed in both branches, but to different names. */
        struct diff_filespec *one = ci->pair1->one;


@@ -1677,7 +1677,7 @@ static int conflict_rename_rename_1to2(struct merge_options *o,
 }
 
 static int conflict_rename_rename_2to1(struct merge_options *o,
 }
 
 static int conflict_rename_rename_2to1(struct merge_options *o,

-                                       struct rename_conflict_info *ci)
+                                      struct rename_conflict_info *ci)

 {
        /* Two files, a & b, were renamed to the same thing, c. */
        struct diff_filespec *a = ci->pair1->one;
 {
        /* Two files, a & b, were renamed to the same thing, c. */
        struct diff_filespec *a = ci->pair1->one;


@@ -2904,7 +2904,8 @@ static struct object_id *stage_oid(const struct object_id *oid, unsigned mode)
 }
 
 static int read_oid_strbuf(struct merge_options *o,
 }
 
 static int read_oid_strbuf(struct merge_options *o,

-       const struct object_id *oid, struct strbuf *dst)
+                          const struct object_id *oid,
+                          struct strbuf *dst)

 {
        void *buf;
        enum object_type type;
 {
        void *buf;
        enum object_type type;


@@ -2957,10 +2958,10 @@ static int blob_unchanged(struct merge_options *opt,
 }
 
 static int handle_modify_delete(struct merge_options *o,
 }
 
 static int handle_modify_delete(struct merge_options *o,

-                                const char *path,
-                                struct object_id *o_oid, int o_mode,
-                                struct object_id *a_oid, int a_mode,
-                                struct object_id *b_oid, int b_mode)
+                               const char *path,
+                               struct object_id *o_oid, int o_mode,
+                               struct object_id *a_oid, int a_mode,
+                               struct object_id *b_oid, int b_mode)

 {
        const char *modify_branch, *delete_branch;
        struct object_id *changed_oid;
 {
        const char *modify_branch, *delete_branch;
        struct object_id *changed_oid;


@@ -3493,14 +3494,14 @@ int merge_recursive_generic(struct merge_options *o,
                        struct commit *base;
                        if (!(base = get_ref(base_list[i], oid_to_hex(base_list[i]))))
                                return err(o, _("Could not parse object '%s'"),
                        struct commit *base;
                        if (!(base = get_ref(base_list[i], oid_to_hex(base_list[i]))))
                                return err(o, _("Could not parse object '%s'"),

-                                       oid_to_hex(base_list[i]));
+                                          oid_to_hex(base_list[i]));

                        commit_list_insert(base, &ca);
                }
        }
 
        hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
        clean = merge_recursive(o, head_commit, next_commit, ca,
                        commit_list_insert(base, &ca);
                }
        }
 
        hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
        clean = merge_recursive(o, head_commit, next_commit, ca,

-                       result);
+                               result);

        if (clean < 0) {
                rollback_lock_file(&lock);
                return clean;
        if (clean < 0) {
                rollback_lock_file(&lock);
                return clean;