Permalink
Commits on Dec 12, 2005
  1. GIT 0.99.9m aka 1.0rc5

    Junio C Hamano
    Junio C Hamano committed Dec 12, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Dec 11, 2005
  1. t/t6022: a new test for renaming merge.

    Junio C Hamano
    Junio C Hamano committed Dec 11, 2005
    This adds a couple of tests to cover the following renaming
    merge cases:
    
     - one side renames and the other side does not, with and without
       content conflicts.
    
     - both side rename to the same path, with and without content
       conflicts.
    
    The test setup also prepares a case in which both side rename to
    different destination, but currently the code collapses these
    destination paths and removes the original path, which may be
    wrong.  The outcome of this case is not checked by the tests in
    this round.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. merge-recursive: cleanup setIndexStages

    Junio C Hamano
    Junio C Hamano committed Dec 11, 2005
    Fredrik points out there is a useful wrapper runProgram() used
    everywhere that we can use to feed input into subprocess.  Use
    it to catch errors from the subprocess; it is a good cleanup as
    well.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. merge-recursive: leave unmerged entries in the index.

    Junio C Hamano
    Junio C Hamano committed Dec 11, 2005
    This does two things.
    
     - When one branch renamed and the other branch did not, the
       resulting half-merged file in the working tree used to swap
       branches around and showed as if renaming side was "ours".
       This was confusing and inconsistent (even though the conflict
       markers were marked with branch names, it was not a good
       enough excuse).  This changes the order of arguments to
       mergeFile in such a case to make sure we always see "our"
       change between <<< and ===, and "their" change between ===
       and >>>.
    
     - When both branches renamed to the same path, and when one
       branch renamed and the other branch did not, we attempt
       mergeFile.  When this automerge conflicted, we used to
       collapse the index.  Now we use update-index --index-info
       to inject higher stage entries to leave the index in unmerged
       state for these two cases.
    
    What this still does _not_ do is to inject unmerged state into
    the index when the structural changes conflict.  I have not
    thought things through what to do in each case yet, but the
    cases this commit cover are the most common ones, so this would
    be a good start.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. format-patch: use same number of digits in numbers

    Junio C Hamano
    Junio C Hamano committed Dec 11, 2005
    This would help sorting by subject in MUA work saner even though
    MUA is too dumb to attempt sorting numbered subjects sanely.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. t0000: catch trivial pilot errors.

    Junio C Hamano
    Junio C Hamano committed Dec 11, 2005
    People seem to be getting test failure from t6021 not becuase
    git is faulty but because they forgot to install "merge".  Check
    this and other trivial pilot errors in the first test.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. t3300: funny name test

    Junio C Hamano
    Junio C Hamano committed Dec 11, 2005
    Add double quote character to the test pattern.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. Allow saving an object from a pipe

    Daniel Barkalow Junio C Hamano
    Daniel Barkalow authored and Junio C Hamano committed Dec 10, 2005
    In order to support getting data into git with scripts, this adds a
    --stdin option to git-hash-object, which will make it read from stdin.
    
    Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. archimport: fix a in new changeset applyer addition

    Eric Wong Martin Langhoff
    Eric Wong authored and Martin Langhoff committed Nov 24, 2005
    Fix a stupid bug I introduced when splitting the
    accurate and fast changeset appliers.
    
    Also, remove an old debugging statement I added
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
  9. archimport: Fix a bug I introduced in the new log parser

    Eric Wong Martin Langhoff
    Eric Wong authored and Martin Langhoff committed Nov 24, 2005
    This fixes the case (that worked originally in Martin's version)
    where the only new/modified files are Arch control files.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
  10. archimport: Add the accurate changeset applyer

    Eric Wong Martin Langhoff
    Eric Wong authored and Martin Langhoff committed Nov 24, 2005
    And make it the default.
    This includes stats tracking to verbose mode
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
  11. archimport: safer log file parsing

    Eric Wong Martin Langhoff
    Eric Wong authored and Martin Langhoff committed Nov 24, 2005
    Better logfile parsing, no longer confused by 'headers' after the first
    blank line.
    
    Re-enabled tag-reading with abrowse (baz and tla compatible)
    
    Remove need to quote args to external processes
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
  12. archimport: add -D <depth> and -a switch

    Eric Wong Martin Langhoff
    Eric Wong authored and Martin Langhoff committed Nov 24, 2005
    add -D <depth> option to abrowse add -a switch to attempt to
    auto-register archives at mirrors.sourcecontrol.net
    
    (ML: Also removes some std libraries no longer in use)
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
  13. archimport: remove git wrapper dependency

    Eric Wong Martin Langhoff
    Eric Wong authored and Martin Langhoff committed Nov 24, 2005
    use git-diff-files instead of git diff-files so we don't rely on the
    wrapper being installed (some people may have git as GNU interactive
    tools :)
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
  14. archimport: fix -t tmpdir switch

    Eric Wong Martin Langhoff
    Eric Wong authored and Martin Langhoff committed Nov 24, 2005
    set TMPDIR env correctly if -t <tmpdir> is passed from the command-line.
    setting TMPDIR => 1 as an argument to tempdir() has no effect otherwise
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
  15. archimport: remove String::ShellQuote dependency.

    Eric Wong Martin Langhoff
    Eric Wong authored and Martin Langhoff committed Nov 24, 2005
    use safe_pipe_capture() or system() over backticks where
    shellquoting may have been necessary.
    More changes planned, so I'm not touching the parts I'm
    planning on replacing entirely.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
  16. archimport: first, make sure it still compiles

    Eric Wong Martin Langhoff
    Eric Wong authored and Martin Langhoff committed Nov 24, 2005
    (ML: And introduce safe_pipe_capture())
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Commits on Dec 10, 2005
  1. Link Everyday GIT to main documentation tree.

    Junio C Hamano
    Junio C Hamano committed Dec 10, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Everyday GIT with 20 commands

    Junio C Hamano
    Junio C Hamano committed Dec 10, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Use GIT_EXEC_PATH explicitly for initial git-init-db in tests.

    Junio C Hamano
    Junio C Hamano committed Dec 10, 2005
    This is just a belts-and-suspenders check, but makes sure we
    have both "git" and "git-init-db" built, executable, and
    checking.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Dec 9, 2005
  1. use "git init-db" in tests

    raalkml authored and Junio C Hamano committed Dec 8, 2005
    This is to catch an error where tests are run without first
    building what are being tested.  Relying on prefixing $PATH with
    the build directory and expect that the PATH mechanism would
    find what we just built would silently run an already installed
    binaries from the PATH.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. git-prune: never lose objects reachable from our refs.

    Junio C Hamano
    Junio C Hamano committed Dec 9, 2005
    Explicit <head> arguments to git-prune replaces, instead of
    extends, the list of heads used for reachability analysis by
    fsck-objects.  By giving a subset of heads by mistake, objects
    reachable only from other heads can be removed, resulting in a
    corrupted repository.
    
    This commit stops replacing the list of heads, and makes the
    command line arguments to add to them instead for safety.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. qsort(): ptrdiff_t may be larger than int

    Junio C Hamano
    Junio C Hamano committed Dec 9, 2005
    This is a companion patch to e23eff8
    commit.  The same logic, the same rationale that a comparison
    function that returns an int should not just compute a ptrdiff_t
    and return it.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Documentation: git-prune

    Junio C Hamano
    Junio C Hamano committed Dec 9, 2005
    Not replacing but always including our own refs may be more
    desirable (and unarguably much safer), but at the same time I
    have a suspicion that that might be forbidding a useful usage I
    haven't thought of, so...
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Dec 8, 2005
  1. Documentation/git-read-tree.txt: Add --reset to SYNOPSIS.

    Nikolai Weibull Junio C Hamano
    Nikolai Weibull authored and Junio C Hamano committed Dec 8, 2005
    Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Documentation/git-tag.txt: Fix the order of sections (DESCRIPTION sho…

    Nikolai Weibull Junio C Hamano
    Nikolai Weibull authored and Junio C Hamano committed Dec 8, 2005
    …uld come before OPTIONS).
    
    Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Documentation/git-update-server-info.txt: Add -f alias for --force to…

    Nikolai Weibull Junio C Hamano
    Nikolai Weibull authored and Junio C Hamano committed Dec 8, 2005
    … documentation.
    
    Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Documentation/git-http-fetch.txt: Document the commit-id argument.

    Nikolai Weibull Junio C Hamano
    Nikolai Weibull authored and Junio C Hamano committed Dec 8, 2005
    Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. Documentation/git-repack.txt: Add -l and -n.

    Nikolai Weibull Junio C Hamano
    Nikolai Weibull authored and Junio C Hamano committed Dec 8, 2005
    This adds documentation for the -l and -n options to git-repack.
    
    Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Documentation/git-ls-remote.txt: Add -h and -t.

    Nikolai Weibull Junio C Hamano
    Nikolai Weibull authored and Junio C Hamano committed Dec 8, 2005
    -h and -t are aliases for --heads and --tags to git-ls-remote.
    
    Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. Documentation/git-format-patch.txt: Add --signoff, --check, and long …

    Nikolai Weibull Junio C Hamano
    Nikolai Weibull authored and Junio C Hamano committed Dec 8, 2005
    …option-names.
    
    The documentation was lacking descriptions for the --signoff and --check
    options to git-format-patch.  It was also missing the following long
    option-names: --output-directory (-o), --numbered (-n), --keep-subject
    (-k), --author (-a), --date (-d), and --mbox (-m).
    
    Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. Add documentation for the --topo-order option to git-show-branch.

    Nikolai Weibull Junio C Hamano
    Nikolai Weibull authored and Junio C Hamano committed Dec 8, 2005
    Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. Add documentation for git-revert and git-cherry-pick.

    Nikolai Weibull Junio C Hamano
    Nikolai Weibull authored and Junio C Hamano committed Dec 8, 2005
    * Added the -e option to the documentation of git-cherry-pick.
    * Added the -e and --no-commit option to git-revert.
    * Removed redundant case expression for -n as --no-edit (already taken by
      --no-commit).
    
    Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. Documentation/git-cherry-pick: Add --replay and --no-commit.

    Nikolai Weibull Junio C Hamano
    Nikolai Weibull authored and Junio C Hamano committed Dec 8, 2005
    Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. Documentation/git-cvsimport.txt: Fix a slight glitch in description h…

    Nikolai Weibull Junio C Hamano
    Nikolai Weibull authored and Junio C Hamano committed Dec 8, 2005
    …eading.
    
    Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>