path: root/read-cache.c
diff options
authorJunio C Hamano <>2008-02-27 20:53:26 (GMT)
committerJunio C Hamano <>2008-02-27 20:53:26 (GMT)
commit5a4d707a6d914fcea302e299fc18892d9e42c767 (patch)
treebcca033e39a540aea39acdcb98ef772631fdbc3b /read-cache.c
parent992221d05e42ad9f65a88318ca6339aa1c39fc79 (diff)
parent04c9e11f2cffaf84dd20602f811bf377f6033cb6 (diff)
Merge branch 'db/checkout'
* db/checkout: (21 commits) checkout: error out when index is unmerged even with -m checkout: show progress when checkout takes long time while switching branches Add merge-subtree back checkout: updates to tracking report builtin-checkout.c: Remove unused prefix arguments in switch_branches path checkout: work from a subdirectory checkout: tone down the "forked status" diagnostic messages Clean up reporting differences on branch switch builtin-checkout.c: fix possible usage segfault checkout: notice when the switched branch is behind or forked Build in checkout Move code to clean up after a branch change to branch.c Library function to check for unmerged index entries Use diff -u instead of diff in t7201 Move create_branch into a library file Build-in merge-recursive Add "skip_unmerged" option to unpack_trees. Discard "deleted" cache entries after using them to update the working tree Send unpack-trees debugging output to stderr Add flag to make unpack_trees() not print errors. ... Conflicts: Makefile
Diffstat (limited to 'read-cache.c')
1 files changed, 10 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c
index fee0c80..657f0c5 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1166,6 +1166,16 @@ int discard_index(struct index_state *istate)
return 0;
+int unmerged_index(struct index_state *istate)
+ int i;
+ for (i = 0; i < istate->cache_nr; i++) {
+ if (ce_stage(istate->cache[i]))
+ return 1;
+ }
+ return 0;
#define WRITE_BUFFER_SIZE 8192
static unsigned char write_buffer[WRITE_BUFFER_SIZE];
static unsigned long write_buffer_len;