| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
| |
When the target of a checkout has a typechange of an item, a modified
index entry should cause a conflict even when the workdir has been
reverted to the baseline.
|
| |
|
|
| |
Introduce a new branch that changes the file `README` into a folder.
|
| |
|
|
|
|
| |
When the target of a checkout has a modification of an item, a modified
index entry should cause a conflict even when the workdir has been
reverted to the baseline.
|
| |
|
|
|
|
| |
When the target of a checkout has a deletion of an item, a modified
index entry should cause a conflict even when the workdir has been
reverted to the baseline.
|
| |
|
|
|
|
|
|
|
| |
When performing a forced checkout, treat files as modified when the
workdir or the index is identical except for the mode. This ensures
that force checkout will update the mode to the target. (Apply this
check for regular files only, if one of the items was a file and the
other was another type of item then this would be a typechange and
handled independently.)
|
| |
|
|
|
| |
Test that we can successfully force checkout a target when the file
contents are identical, but the mode has changed.
|
| |
|
|
|
|
|
|
|
| |
When performing a forced checkout, treat files as modified when the
workdir is identical to the target, but the index differs. This
ensures that we update the index to match, instead of assuming that
since the working directory does not differ, there's nothing to do.
Otherwise we would keep the index as-is and the staged change would
propagate past the force checkout.
|
| |
|
|
|
| |
Test that we can successfully force checkout a target when the workdir
was updated (to match the target) but the index differs.
|
| |\
| |
| | |
Cleanups
|
| | | |
|
| | |
| |
| |
| |
| |
| | |
Avoid declaring old-style functions without any parameters.
Functions not accepting any parameters should be declared with
`void fn(void)`. See ISO C89 $3.5.4.3.
|
| |\ \
| |/
|/| |
cmake: do not use -fPIC for MSYS2
|
| |/
|
|
|
|
|
|
|
| |
The MSYS2 build system automatically compiles all code with position-independent
code. When we manually add the -fPIC flag to the compiler flags, MSYS2 will
loudly complain about PIC being the default and thus not required.
Fix the annoyance by stripping -fPIC in MSYS2 enviroments like it is already
done for MinGW.
|
| |\
| |
| | |
Thread namespacing
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The old pthread-file did re-implement the pthreads API with exact symbol
matching. As the thread-abstraction has now been split up between Unix- and
Windows-specific files within the `git_` namespace to avoid symbol-clashes
between libgit2 and pthreads, the rewritten wrappers have nothing to do with
pthreads anymore.
Rename the Windows-specific pthread-files to honor this change.
|
| | | |
|
| | |
| |
| |
| |
| | |
The function pthread_num_processors_np is currently unused and superseded by the
function `git_online_cpus`. Remove the function.
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |\ \
| | |
| | |
| | | |
Fix truncation of SHA in error message for git_odb_read
|
| | | | |
|
| |\ \ \
| |_|/
|/| | |
HTTP authentication scheme name is case insensitive.
|
| |/ / |
|
| |\ \
| | |
| | | |
checkout: use empty baseline when no index file exists
|
| | | |
| | |
| | |
| | |
| | | |
When no index file exists and a baseline is not explicitly provided, use
an empty baseline instead of trying to load `HEAD`.
|
| |\ \ \
| |/ /
|/| | |
documentation: improve docs for `checkout_head`
|
| | | |
| | |
| | |
| | |
| | | |
`git_checkout_head` is sadly misunderstood as something that can
switch branches. It cannot. Update the documentation to reflect this.
|
| |\ \ \
| |/ /
|/| | |
fetch: Fixed spurious update callback for existing tags.
|
| | |/ |
|
| |\ \
| | |
| | | |
Memory leak fixes
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The thread local storage is used to hold some global state that
is dynamically allocated and should be freed upon exit. On
Windows, we clean up the C run-time right after execution of
registered shutdown callbacks and before cleaning up the TLS.
When we clean up the CRT, we also cause it to analyze for memory
leaks. As we did not free the TLS yet this will lead to false
positives.
Fix the issue by first freeing the TLS and cleaning up the CRT
only afterwards.
|
| | |/ |
|
| |\ \
| |/
|/| |
Fix invalid memory references
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When removing an entry from the index by its position, we first
retrieve the position from the index's entries and then try to
remove the retrieved value from the index map with
`DELETE_IN_MAP`. When `index_remove_entry` returns `NULL` we try
to feed it into the `DELETE_IN_MAP` macro, which will
unconditionally call `idxentry_hash` and then happily dereference
the `NULL` entry pointer.
Fix the issue by not passing a `NULL` entry into `DELETE_IN_MAP`.
|
| |/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When we receive a packet of exactly four bytes encoding its
length as those four bytes it can be treated as an empty line.
While it is not really specified how those empty lines should be
treated, we currently ignore them and do not return an error when
trying to parse it but simply advance the data pointer.
Callers invoking `git_pkt_parse_line` are currently not prepared
to handle this case as they do not explicitly check this case.
While they could always reset the passed out-pointer to `NULL`
before calling `git_pkt_parse_line` and determine if the pointer
has been set afterwards, it makes more sense to update
`git_pkt_parse_line` to set the out-pointer to `NULL` itself when
it encounters such an empty packet. Like this it is guaranteed
that there will be no invalid memory references to free'd
pointers.
As such, the issue has been fixed such that `git_pkt_parse_line`
always sets the packet out pointer to `NULL` when an empty packet
has been received and callers check for this condition, skipping
such packets.
|
| |\
| |
| | |
`git_index_read_index` fixes
|
| | |
| |
| |
| |
| |
| | |
When adding a new entry to an existing index via `git_index_read_index`,
be sure to remove the tree cache entry for that new path. This will
mark all parent trees as dirty.
|
| | |
| |
| |
| |
| | |
Test a rebase (both a merge rebase and an inmemory rebase) with a new
commit that adds files underneath a new subfolder.
|
| | |
| |
| |
| |
| | |
Read a tree into an index, write the index, then re-open the index and
ensure that we are treesame to the original.
|
| | |
| |
| |
| | |
Update the flags to reset the path_len (to emulate `index_insert`)
|
| | |
| |
| |
| |
| | |
Treat index entries with different modes as different, which they
are, at least for the purposes of up-to-date calculations.
|
| | |
| |
| |
| |
| |
| | |
Clear any error state upon each iteration. If one of the iterations
ends (with an error of `GIT_ITEROVER`) we need to reset that error to 0,
lest we stop the whole process prematurely.
|
| |/
|
|
|
|
|
| |
Read a tree into an index using `git_index_read_index` (by reading
a tree into a new index, then reading that index into the current
index), then write the index back out, ensuring that our new index
is treesame to the tree that we read.
|
| |\
| |
| | |
Preliminary Haiku port
|
| | | |
|
