mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-06 11:19:47 +00:00
ccfa68055c
This started out trying to look at the problems from issue #1425 and gradually grew to a broader set of fixes. There are two core things fixed here: 1. When you had an ignore like "/bin" which is rooted at the top of your tree, instead of immediately adding the "bin/" entry as an ignored item in the diff, we were returning all of the direct descendants of the directory as ignored items. This changes things to immediately ignore the directory. Note that this effects the behavior in test_status_ignore__subdirectories so that we no longer exactly match core gits ignore behavior, but the new behavior probably makes more sense (i.e. we now will include an ignored directory inside an untracked directory that we previously would have left off). 2. When a submodule only contained working directory changes, the diff code was always considering it unmodified which was just an outright bug. The HEAD SHA of the submodule matches the SHA in the parent repo index, and since the SHAs matches, the diff code was overwriting the actual status with UNMODIFIED. These fixes broke existing tests test_diff_workdir__submodules and test_status_ignore__subdirectories but looking it over, I actually think the new results are correct and the old results were wrong. @nulltoken had actually commented on the subdirectory ignore issue previously. I also included in the tests some debugging versions of the shared iteration callback routines that print status or diff information. These aren't used actively in the tests, but can be quickly swapped in to test code to give a better picture of what is being scanned in some of the complex test scenarios.
38 lines
933 B
C
38 lines
933 B
C
#ifndef INCLUDE_cl_status_helpers_h__
|
|
#define INCLUDE_cl_status_helpers_h__
|
|
|
|
typedef struct {
|
|
int wrong_status_flags_count;
|
|
int wrong_sorted_path;
|
|
int entry_count;
|
|
const unsigned int* expected_statuses;
|
|
const char** expected_paths;
|
|
int expected_entry_count;
|
|
} status_entry_counts;
|
|
|
|
/* cb_status__normal takes payload of "status_entry_counts *" */
|
|
|
|
extern int cb_status__normal(
|
|
const char *path, unsigned int status_flags, void *payload);
|
|
|
|
|
|
/* cb_status__count takes payload of "int *" */
|
|
|
|
extern int cb_status__count(const char *p, unsigned int s, void *payload);
|
|
|
|
|
|
typedef struct {
|
|
int count;
|
|
unsigned int status;
|
|
} status_entry_single;
|
|
|
|
/* cb_status__single takes payload of "status_entry_single *" */
|
|
|
|
extern int cb_status__single(const char *p, unsigned int s, void *payload);
|
|
|
|
/* cb_status__print takes optional payload of "int *" */
|
|
|
|
extern int cb_status__print(const char *p, unsigned int s, void *payload);
|
|
|
|
#endif
|