summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2017-05-30 17:30:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-02 00:36:06 (GMT)
commitbb7e4739712e3f9eee0dfd60088b6d8983067960 (patch)
treea6f1b9377836b010f44c4442ffb13a0afb584752 /builtin/am.c
parentfb61e4d3abe2349eb0fabe0be8981626b4074fa7 (diff)
downloadgit-bb7e4739712e3f9eee0dfd60088b6d8983067960.zip
git-bb7e4739712e3f9eee0dfd60088b6d8983067960.tar.gz
git-bb7e4739712e3f9eee0dfd60088b6d8983067960.tar.bz2
builtin/notes: convert to struct object_id
Convert most of the static functions to use struct object_id. In addition, convert copy_notes_for_rewrite and its callers. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/am.c')
-rw-r--r--builtin/am.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c
index 0f63dca..d9fddda 100644
--- 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));
}