summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2017-05-06 22:10:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-08 06:12:58 (GMT)
commit944cffbd18a7dbe0b4c5849da6f093c41b49ea00 (patch)
tree2f772ea511efebff44244c955345182ce2dfedd1 /builtin/am.c
parenta9b5f5bfd50bfd0a96e464ccf926092ffe03163a (diff)
downloadgit-944cffbd18a7dbe0b4c5849da6f093c41b49ea00.zip
git-944cffbd18a7dbe0b4c5849da6f093c41b49ea00.tar.gz
git-944cffbd18a7dbe0b4c5849da6f093c41b49ea00.tar.bz2
diff-lib: convert do_diff_cache to struct object_id
This is needed to convert parse_tree_indirect. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> 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 642d704..200d9db 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1145,7 +1145,7 @@ static int index_has_changes(struct strbuf *sb)
DIFF_OPT_SET(&opt, EXIT_WITH_STATUS);
if (!sb)
DIFF_OPT_SET(&opt, QUICK);
- do_diff_cache(head.hash, &opt);
+ do_diff_cache(&head, &opt);
diffcore_std(&opt);
for (i = 0; sb && i < diff_queued_diff.nr; i++) {
if (i)