summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2018-07-01 01:24:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-03 20:13:17 (GMT)
commitcffbfad50d1f37aea03520dd8d8ea983bc57da02 (patch)
tree65a5527116f958266b3237e4e50519f5034ab41c /read-cache.c
parentfc54c1af3ec09bab8b8ea09768c2da4069b7f53e (diff)
downloadgit-cffbfad50d1f37aea03520dd8d8ea983bc57da02.zip
git-cffbfad50d1f37aea03520dd8d8ea983bc57da02.tar.gz
git-cffbfad50d1f37aea03520dd8d8ea983bc57da02.tar.bz2
read-cache.c: move index_has_changes() from merge.c
Since index_has_change() is an index-related function, move it to read-cache.c, only modifying it to avoid uses of the active_cache and active_nr macros. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'read-cache.c')
-rw-r--r--read-cache.c33
1 files changed, 33 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c
index 4b35e87..ba094fd 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -6,6 +6,8 @@
#define NO_THE_INDEX_COMPATIBILITY_MACROS
#include "cache.h"
#include "config.h"
+#include "diff.h"
+#include "diffcore.h"
#include "tempfile.h"
#include "lockfile.h"
#include "cache-tree.h"
@@ -1984,6 +1986,37 @@ int unmerged_index(const struct index_state *istate)
return 0;
}
+int index_has_changes(struct strbuf *sb)
+{
+ struct object_id head;
+ int i;
+
+ if (!get_oid_tree("HEAD", &head)) {
+ struct diff_options opt;
+
+ diff_setup(&opt);
+ opt.flags.exit_with_status = 1;
+ if (!sb)
+ opt.flags.quick = 1;
+ do_diff_cache(&head, &opt);
+ diffcore_std(&opt);
+ for (i = 0; sb && i < diff_queued_diff.nr; i++) {
+ if (i)
+ strbuf_addch(sb, ' ');
+ strbuf_addstr(sb, diff_queued_diff.queue[i]->two->path);
+ }
+ diff_flush(&opt);
+ return opt.flags.has_changes != 0;
+ } else {
+ for (i = 0; sb && i < the_index.cache_nr; i++) {
+ if (i)
+ strbuf_addch(sb, ' ');
+ strbuf_addstr(sb, the_index.cache[i]->name);
+ }
+ return !!the_index.cache_nr;
+ }
+}
+
#define WRITE_BUFFER_SIZE 8192
static unsigned char write_buffer[WRITE_BUFFER_SIZE];
static unsigned long write_buffer_len;