Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
diff: remove DIFF_OPT_TST macro
[gitweb.git]
/
builtin
/
am.c
diff --git
a/builtin/am.c
b/builtin/am.c
index d7513f53759bc5834aa02bd904432f64e036ccb6..fc54724cc1829c7d88b6822af564061df9e27c26 100644
(file)
--- a/
builtin/am.c
+++ b/
builtin/am.c
@@
-1168,7
+1168,7
@@
static int index_has_changes(struct strbuf *sb)
strbuf_addstr(sb, diff_queued_diff.queue[i]->two->path);
}
diff_flush(&opt);
- return
DIFF_OPT_TST(&opt, HAS_CHANGES)
!= 0;
+ return
opt.flags.HAS_CHANGES
!= 0;
} else {
for (i = 0; sb && i < active_nr; i++) {
if (i)