pull: optionally rebase submodules (remote submodule changes only)

diff --git a/builtin/am.c b/builtin/am.c
index 8881d736151bf266cc8544a717cba960c078eff5..3985f9a89f985baa139ea69f5fde8ce1384871f6 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -563,7 +563,7 @@ static int copy_notes_for_rebase(const struct am_state *state)
                        goto finish;
                }
 
-               if (copy_note_for_rewrite(c, from_obj.hash, to_obj.hash))
+               if (copy_note_for_rewrite(c, &from_obj, &to_obj))
                        ret = error(_("Failed to copy notes from '%s' to '%s'"),
                                        oid_to_hex(&from_obj), oid_to_hex(&to_obj));
        }