1. 10 Jun, 2017 2 commits
    • checkout: cope with untracked files in directory deletion · 83989d70
      When deleting a directory during checkout, do not simply delete the
      directory, since there may be untracked files.  Instead, go into
      the iterator and examine each file.
      
      In the original code (the code with the faulty assumption), we look to
      see if there's an index entry beneath the directory that we want to
      remove.   Eg, it looks to see if we have a workdir entry foo and an
      index entry foo/bar.txt. If this is not the case, then the working
      directory must have precious files in that directory. This part is okay.
      The part that's not okay is if there is an index entry foo/bar.txt. It
      just blows away the whole damned directory.
      
      That's not cool.
      
      Instead, by simply pushing the directory itself onto the stack and
      iterating each entry, we will deal with the files one by one - whether
      they're in the index (and can be force removed) or not (and are
      precious).
      
      The original code was a bad optimization, assuming that we didn't need
      to git_iterator_advance_into if there was any index entry in the folder.
      That's wrong - we could have optimized this iff all folder entries are
      in the index.
      
      Instead, we need to simply dig into the directory and analyze its
      entries.
      Edward Thomson committed
    • checkout: do not delete directories with untracked entries · 0ef405b3
      If the `GIT_CHECKOUT_FORCE` flag is given to any of the `git_checkout`
      invocations, we remove files which were previously staged. But while
      doing so, we unfortunately also remove unstaged files in a directory
      which contains at least one staged file, resulting in potential data
      loss.
      
      This commit adds two tests to verify behavior.
      Patrick Steinhardt committed
  2. 10 Apr, 2017 1 commit
  3. 07 Apr, 2017 2 commits
  4. 05 Apr, 2017 1 commit
    • pkgconfig: fix handling of prefixes containing whitespaces · 22436f29
      Our libgit2.pc.in file is quoting the `libdir` variable in our declared
      "Libs:" line. The intention is to handle whitespaces here, but pkgconfig
      already does so by automatically escaping whitespace with backslashes.
      The correct thing to do is to instead quote the prefix, as this is the
      one which is being substituted by CMake upon installation. As both
      libdir and includedir will be expanded to "${prefix}/lib" and
      "${prefix}/include", respectively, pkgconfig will also correctly escape
      whitespaces.
      
      Note that this will actually break when a user manually wants to
      override libdir and includedir with a path containing whitespace. But
      actually, this cannot be helped, as always quoting these variables will
      actuall break the common case of being prefixed with "${prefix}". So we
      just bail out here and declare this as unsupported out of the box.
      Patrick Steinhardt committed
  5. 04 Apr, 2017 5 commits
    • fileops: do not overwrite correct error message on mmap · 9daba9f4
      When executing `git_futils_mmap_ro_file`, we first try to guess whether
      the file is mmapable at all. Part of this check is whether the file is
      too large to be mmaped, which can be true on systems with 32 bit
      `size_t` types.
      
      The check is performed by first getting the file size wtih
      `git_futils_filesize` and then checking whether the returned size can be
      represented as `size_t`, returning an error if so. While this test also
      catches the case where the function returned an error (as `-1` is not
      representable by `size_t`), we will set the misleading error message
      "file too large to mmap". But in fact, a negative return value from
      `git_futils_filesize` will be caused by the inability to fstat the file.
      
      Fix the error message by handling negative return values separately and
      not overwriting the error message in that case.
      Patrick Steinhardt committed
    • blame_git: check return value of `git__calloc` · 756138e4
      We do not check the return value of `git__calloc`, which may return
      `NULL` in out-of-memory situations. Fix the error by using
      `GITERR_CHECK_ALLOC`.
      Patrick Steinhardt committed
    • path: short-circuit `git_path_apply_relative` on error · a76d7502
      Short-circuit the call to `git_path_resolve_relative` in case
      `git_buf_joinpath` returns an error. While this does not fix any
      immediate errors, the resulting code is easier to read and handles
      potential new error conditions raised by `git_buf_joinpath`.
      Patrick Steinhardt committed
    • path: handle error returned by `git_buf_joinpath` · cffd616a
      In the `_check_dir_contents` function, we first allocate memory for
      joining the directory and subdirectory together and afterwards use
      `git_buf_joinpath`. While this function in fact should not fail as
      memory is already allocated, err on the safe side and check for returned
      errors.
      Patrick Steinhardt committed
    • config_file: handle errors other than OOM while parsing section headers · 4467aeac
      The current code in `parse_section_header_ext` is only prepared to
      properly handle out-of-memory conditions for the `git_buf` structure.
      While very unlikely and probably caused by a programming error, it is
      also possible to run into error conditions other than out-of-memory
      previous to reaching the actual parsing loop. In these cases, we will
      run into undefined behavior as the `rpos` variable is only initialized
      after these triggerable errors, but we use it in the cleanup-routine.
      
      Fix the issue by unifying the function's cleanup code with an
      `end_error` section, which will not use the `rpos` variable.
      Patrick Steinhardt committed
  6. 03 Apr, 2017 2 commits
  7. 28 Mar, 2017 5 commits
  8. 24 Mar, 2017 3 commits
  9. 23 Mar, 2017 6 commits
  10. 22 Mar, 2017 6 commits
  11. 21 Mar, 2017 7 commits