thodg/libgit2/src/diff.h

• Show log

  Commit

• Hash : 0abd7244
  Author :
  Date : 2012-06-04T16:17:41
  

  Fix filemode comparison in diffs File modes were both not being ignored properly on platforms where they should be ignored, nor be diffed consistently on platforms where they are supported. This change adds a number of diff and status filemode change tests. This also makes sure that filemode-only changes are included in the diff output when they occur and that filemode changes are ignored successfully when core.filemode is false. There is no code that automatically toggles core.filemode based on the capabilities of the current platform, so the user still needs to be careful in their .git/config file.

Download

• src/diff.h

• /*
   * Copyright (C) 2009-2012 the libgit2 contributors
   *
   * This file is part of libgit2, distributed under the GNU GPL v2 with
   * a Linking Exception. For full terms see the included COPYING file.
   */
  #ifndef INCLUDE_diff_h__
  #define INCLUDE_diff_h__
  
  #include <stdio.h>
  #include "vector.h"
  #include "buffer.h"
  #include "iterator.h"
  #include "repository.h"
  #include "pool.h"
  
  #define DIFF_OLD_PREFIX_DEFAULT "a/"
  #define DIFF_NEW_PREFIX_DEFAULT "b/"
  
  enum {
  	GIT_DIFFCAPS_HAS_SYMLINKS     = (1 << 0), /* symlinks on platform? */
  	GIT_DIFFCAPS_ASSUME_UNCHANGED = (1 << 1), /* use stat? */
  	GIT_DIFFCAPS_TRUST_MODE_BITS  = (1 << 2), /* use st_mode? */
  	GIT_DIFFCAPS_TRUST_CTIME      = (1 << 3), /* use st_ctime? */
  	GIT_DIFFCAPS_USE_DEV          = (1 << 4), /* use st_dev? */
  };
  
  struct git_diff_list {
  	git_repository   *repo;
  	git_diff_options opts;
  	git_vector       pathspec;
  	git_vector       deltas;    /* vector of git_diff_file_delta */
  	git_pool pool;
  	git_iterator_type_t old_src;
  	git_iterator_type_t new_src;
  	uint32_t diffcaps;
  };
  
  extern void git_diff__cleanup_modes(
  	uint32_t diffcaps, uint32_t *omode, uint32_t *nmode);
  
  #endif
  
  

Download