1. 13 Jun, 2013 1 commit
  2. 25 Mar, 2013 1 commit
    • René Scharfe's avatar
      match-trees: simplify score_trees() using tree_entry() · d8febde3
      René Scharfe authored
      Convert the loop in score_trees() to tree_entry().  The code becomes
      shorter and simpler because the calls to update_tree_entry() are not
      needed any more.
      Another benefit is that we need less variables to track the current
      tree entries; as a side-effect of that the compiler has an easier
      job figuring out the control flow and thus can avoid false warnings
      about uninitialized variables.
      Using struct name_entry also allows the use of tree_entry_len() for
      finding the path length instead of strlen(), which may be slightly
      more efficient.
      Also unify the handling of missing entries in one of the two trees
      (i.e. added or removed files): Just set cmp appropriately first, no
      matter if we ran off the end of a tree or if we actually have two
      entries to compare, and check its value a bit later without
      duplicating the handler code.
      Signed-off-by: default avatarRene Scharfe <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
  3. 18 Jan, 2010 1 commit
    • Junio C Hamano's avatar
      Make "subtree" part more orthogonal to the rest of merge-recursive. · 85e51b78
      Junio C Hamano authored
      This makes "subtree" more orthogonal to the rest of recursive merge, so
      that you can use subtree and ours/theirs features at the same time.  For
      example, you can now say:
      	git merge -s subtree -Xtheirs other
      to merge with "other" branch while shifting it up or down to match the
      shape of the tree of the current branch, and resolving conflicts favoring
      the changes "other" branch made over changes made in the current branch.
      It also allows the prefix used to shift the trees to be specified using
      the "-Xsubtree=$prefix" option.  Giving an empty prefix tells the command
      to figure out how much to shift trees automatically as we have always
      done.  "merge -s subtree" is the same as "merge -s recursive -Xsubtree="
      (or "merge -s recursive -Xsubtree").
      Based on an old patch done back in the days when git-merge was a script;
      Avery ported the script part to builtin-merge.c.  Bugs in shift_tree()
      is mine.
      Signed-off-by: default avatarAvery Pennarun <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
  4. 21 Oct, 2007 1 commit
  5. 07 Jun, 2007 1 commit
    • Junio C Hamano's avatar
      War on whitespace · a6080a0a
      Junio C Hamano authored
      This uses "git-apply --whitespace=strip" to fix whitespace errors that have
      crept in to our source files over time.  There are a few files that need
      to have trailing whitespaces (most notably, test vectors).  The results
      still passes the test, and build result in Documentation/ area is unchanged.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
  6. 07 Apr, 2007 1 commit
    • Junio C Hamano's avatar
      A new merge stragety 'subtree'. · 68faf689
      Junio C Hamano authored
      This merge strategy largely piggy-backs on git-merge-recursive.
      When merging trees A and B, if B corresponds to a subtree of A,
      B is first adjusted to match the tree structure of A, instead of
      reading the trees at the same level.  This adjustment is also
      done to the common ancestor tree.
      If you are pulling updates from git-gui repository into git.git
      repository, the root level of the former corresponds to git-gui/
      subdirectory of the latter.  The tree object of git-gui's toplevel
      is wrapped in a fake tree object, whose sole entry has name 'git-gui'
      and records object name of the true tree, before being used by
      the 3-way merge code.
      If you are merging the other way, only the git-gui/ subtree of
      git.git is extracted and merged into git-gui's toplevel.
      The detection of corresponding subtree is done by comparing the
      pathnames and types in the toplevel of the tree.
      Heuristics galore!  That's the git way ;-).
      Signed-off-by: default avatarJunio C Hamano <[email protected]>