1. 28 Apr, 2005 1 commit
  2. 27 Apr, 2005 17 commits
  3. 26 Apr, 2005 7 commits
    • Linus Torvalds's avatar
      git-pull-script: do automatic merges · 9831d8f8
      Linus Torvalds authored
      When the trivial "read-tree" merge fails, fall back on the (equally
      trivial) automatic merge script instead of forcing the user to do
      it by hand.
      When _that_ fails, you get to do a manual merge.
    • Christopher Li's avatar
      [PATCH] introduce xmalloc and xrealloc · 812666c8
      Christopher Li authored
      Introduce xmalloc and xrealloc to die gracefully with a descriptive
      message when out of memory, rather than taking a SIGSEGV. 
      Signed-off-by: Christopher Li<[email protected]>
      Signed-off-by: default avatarLinus Torvalds <[email protected]>
    • Linus Torvalds's avatar
      update-cache: remove index lock file on SIGINT · f2a19340
      Linus Torvalds authored
      This makes it a lot more pleasant to use when you
      interrupt a long-running operation.
    • Junio C Hamano's avatar
      [PATCH] diff-cache buglet · 5697ecc7
      Junio C Hamano authored
      diff-cache attempts to first remove all merge entries before letting the
      diff_cache() do its work, but it incorrectly stops after the first
      merge-entry it finds.
      Fix by just replacing the "break" with a "continue".
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      Signed-off-by: default avatarLinus Torvalds <[email protected]>
    • Junio C Hamano's avatar
      [PATCH] Diff-tree-helper take two. · be3cfa85
      Junio C Hamano authored
      This reworks the diff-tree-helper and show-diff to further make external
      diff command interface simpler.
      These commands now honor GIT_EXTERNAL_DIFF environment variable which
      can point at an arbitrary program that takes 7 parameters:
        name file1 file1-sha1 file1-mode file2 file2-sha1 file2-mode
      The parameters for an external diff command are as follows:
        name        this invocation of the command is to emit diff
      	      for the named cache/tree entry.
        file1       pathname that holds the contents of the first
      	      file.  This can be a file inside the working
      	      tree, or a temporary file created from the blob
      	      object, or /dev/null.  The command should not
      	      attempt to unlink it -- the temporary is
      	      unlinked by the caller.
        file1-sha1  sha1 hash if file1 is a blob object, or "."
        file1-mode  mode bits for file1, or "." for a deleted file.
      If GIT_EXTERNAL_DIFF environment variable is not set, the
      default is to invoke diff with the set of parameters old
      show-diff used to use.  This built-in implementation honors the
      GIT_DIFF_CMD and GIT_DIFF_OPTS environment variables as before.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      Signed-off-by: default avatarLinus Torvalds <[email protected]>
    • Junio C Hamano's avatar
      [PATCH] Introduce diff-tree-helper. · d1df5743
      Junio C Hamano authored
      This patch introduces a new program, diff-tree-helper.  It reads
      output from diff-cache and diff-tree, and produces a patch file.
      The diff format customization can be done the same way the
      show-diff uses; the same external diff interface introduced by
      the previous patch to drive diff from show-diff is used so this
      is not surprising.
      It is used like the following examples:
         $ diff-cache --cached -z <tree> | diff-tree-helper -z -R paths...
         $ diff-tree -r -z <tree1> <tree2> | diff-tree-helper -z paths...
       - As usual, the use of the -z flag is recommended in the script
         to pass NUL-terminated filenames through the pipe between
       - The -R flag is used to generate reverse diff.  It does not
         matter for diff-tree case, but it is sometimes useful to get
         a patch in the desired direction out of diff-cache.
       - The paths parameters are used to restrict the paths that
         appears in the output.  Again this is useful to use with
         diff-cache, which, unlike diff-tree, does not take such paths
         restriction parameters.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      Signed-off-by: default avatarLinus Torvalds <[email protected]>
    • Junio C Hamano's avatar
      [PATCH] Split external diff command interface to a separate file. · 86436c28
      Junio C Hamano authored
      With this patch, the non-core'ish part of show-diff command that
      invokes an external "diff" comand to obtain patches is split
      into a separate file.  The next patch will introduce a new
      command, diff-tree-helper, which uses this common diff interface
      to format diff-tree and diff-cache output into a patch form.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      Signed-off-by: default avatarLinus Torvalds <[email protected]>
  4. 25 Apr, 2005 8 commits
  5. 24 Apr, 2005 7 commits