Permalink
Commits on Dec 1, 2007
  1. GIT 1.5.3.7

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 1, 2007
  2. Fix typo in t4008 test title

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 1, 2007
Commits on Nov 30, 2007
  1. Replace the word 'update-cache' by 'update-index' everywhere

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Nov 30, 2007
  2. cvsimport: fix usage of cvsimport.module

    There were two problems:
    
      1. We only look at the config variable if there is no module
         given on the command line. We checked this by comparing
         @ARGV == 0. However, at the time of the comparison, we
         have not yet parsed the dashed options, meaning that
         "git cvsimport" would read the variable but "git
         cvsimport -a" would not. This is fixed by simply moving
         the check after the call to getopt.
    
      2. If the config variable did not exist, we were adding an
         empty string to @ARGV. The rest of the script, rather
         than barfing for insufficient input, would then try to
         import the module '', leading to rather confusing error
         messages. Based on patch from Emanuele Giaquinta.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Nov 30, 2007
  3. Merge branch 'jk/maint-cvsimport-fix' into maint

    * jk/maint-cvsimport-fix:
      cvsimport: miscellaneous packed-ref fixes
      cvsimport: use rev-parse to support packed refs
      Add basic cvsimport tests
    gitster committed Nov 30, 2007
  4. t7003-filter-branch: Fix test of a failing --msg-filter.

    The test passed for the wrong reason: If the script given to --msg-filter
    fails, it is expected that git-filter-branch aborts. But the test forgot
    to tell the branch name to rewrite, and so git-filter-branch failed due to
    incorrect usage.
    
    Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Johannes Sixt committed with gitster Nov 27, 2007
Commits on Nov 29, 2007
  1. scripts: do not get confused with HEAD in work tree

    When you have a file called HEAD in your work tree, many commands that
    our scripts feed "HEAD" to would complain about the rev vs path
    ambiguity.  A solution is to form command line more carefully by
    appending -- to them, which makes it clear that we mean HEAD rev not
    HEAD file.
    
    This patch would apply to maint.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 29, 2007
Commits on Nov 28, 2007
  1. Improve description of git-branch -d and -D in man page.

    Some users expect that deleting a remote-tracking branch would prevent
    fetch from creating it again, so be explcit about that it's not the case.
    Also be a little more explicit about what fully merged means.
    
    Signed-off-by: Jan Hudec <bulb@ucw.cz>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jan-hudec committed with gitster Nov 17, 2007
  2. cvsimport: miscellaneous packed-ref fixes

    These were found with a grep for '$git_dir'; they all
    replace a direct access of "$git_dir/refs/..." with a call
    to git-rev-parse or git-update-ref.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Nov 28, 2007
  3. cvsimport: use rev-parse to support packed refs

    Previously, if refs were packed, git-cvsimport would assume
    that particular refs did not exist. This could lead to, for
    example, overwriting previous 'origin' commits that were
    packed.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Nov 28, 2007
  4. Add basic cvsimport tests

    We weren't even testing basic things before, so let's at
    least try importing and updating a trivial repository, which
    will catch total breakage.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Nov 28, 2007
Commits on Nov 26, 2007
  1. Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

    * 'maint' of git://linux-nfs.org/~bfields/git:
      user-manual: recovering from corruption
      user-manual: clarify language about "modifying" old commits
      user-manual: failed push to public repository
      user-manual: define "branch" and "working tree" at start
    gitster committed Nov 26, 2007
  2. user-manual: recovering from corruption

    Some instructions on dealing with corruption of the object database.
    
    Most of this text is from an example by Linus, identified by Nicolas
    Pitre <nico@cam.org> with a little further editing by me.
    
    Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
    J. Bruce Fields committed Mar 4, 2007
  3. user-manual: clarify language about "modifying" old commits

    It's important to remember that git doesn't really allowing "editing" or
    "modifying" commits, only replacing them by new commits.  Redo some of
    the language to make this clearer.
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    J. Bruce Fields committed Nov 26, 2007
Commits on Nov 25, 2007
  1. user-manual: failed push to public repository

    More details on the case of a failed push to a public (non-shared)
    repository.
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    J. Bruce Fields committed Nov 25, 2007
  2. user-manual: define "branch" and "working tree" at start

    Some explanation here might help.
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    J. Bruce Fields committed Nov 25, 2007
  3. git-checkout: describe detached head correctly

    When you have a file called HEAD in the work tree, the code to report
    where the HEAD is at when "git checkout $commit^0" is done triggered
    unnecessary ambiguity checking.
    
    Explicitly mark the command line with "--" and make it clear that we are
    talking about a revision.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 25, 2007
  4. Merge branch 'rv/maint-index-commit' into maint

    * rv/maint-index-commit:
      Make GIT_INDEX_FILE apply to git-commit
    gitster committed Nov 25, 2007
  5. Merge branch 'lt/maint-rev-list-gitlink' into maint

    * lt/maint-rev-list-gitlink:
      Fix rev-list when showing objects involving submodules
    gitster committed Nov 25, 2007
  6. Merge branch 'jc/maint-add-sync-stat' into maint

    * jc/maint-add-sync-stat:
      t2200: test more cases of "add -u"
      git-add: make the entry stat-clean after re-adding the same contents
      ce_match_stat, run_diff_files: use symbolic constants for readability
    gitster committed Nov 25, 2007
  7. Merge branch 'jc/maint-format-patch-encoding' into maint

    * jc/maint-format-patch-encoding:
      test format-patch -s: make sure MIME content type is shown as needed
      format-patch -s: add MIME encoding header if signer's name requires so
    gitster committed Nov 25, 2007
  8. Merge branch 'bs/maint-t7005' into maint

    * bs/maint-t7005:
      t7005-editor.sh: Don't invoke real vi when it is in GIT_EXEC_PATH
    gitster committed Nov 25, 2007
  9. Merge branch 'bs/maint-commit-options' into maint

    * bs/maint-commit-options:
      git-commit: Add tests for invalid usage of -a/--interactive with paths
      git-commit.sh: Fix usage checks regarding paths given when they do not make sense
    gitster committed Nov 25, 2007
Commits on Nov 23, 2007
  1. Fix sample pre-commit hook

    If the worktree happened to have a file called HEAD, "diff-index --cached HEAD"
    would complain about the ambiguity between revision and path.  Avoid it by
    using an explicit "--" for disambiguation.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 23, 2007
  2. Make test scripts executable.

    gitster committed Nov 23, 2007
Commits on Nov 22, 2007
  1. bundle create: keep symbolic refs' names instead of resolving them

    When creating a bundle, symbolic refs used to be resolved to the
    non-symbolic refs they point to before being written to the list
    of contained refs.  I.e. "git bundle create a1.bundle HEAD master"
    would show something like
    
    388afe7881b33102fada216dd07806728773c011        refs/heads/master
    388afe7881b33102fada216dd07806728773c011        refs/heads/master
    
    instead of
    
    388afe7881b33102fada216dd07806728773c011        HEAD
    388afe7881b33102fada216dd07806728773c011        refs/heads/master
    
    Introduce a special handling so that the symbolic refs are listed
    with the names passed on the command line.
    
    Noticed by Santi Béjar.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Nov 22, 2007
Commits on Nov 21, 2007
  1. send-email: add transfer encoding header with content-type

    We add the content-type header only when we have non-7bit
    characters from the 'From' header, so we really need to
    specify the encoding (in other cases, where the commit text
    needed a content-type, git-format-patch will already have
    added the encoding header).
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Nov 20, 2007
Commits on Nov 20, 2007
  1. Doc fix for git-reflog: mention @{...} syntax, and <ref> in synopsys.

    The HEAD@{...} syntax was documented in git-rev-parse manpage, which
    is hard to find by someone looking for the documentation of porcelain.
    git-reflog is probably the place where one expects to find this.
    
    While I'm there, "git revlog show whatever" was also undocumented.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    moy committed with gitster Nov 19, 2007
  2. config: clarify compression defaults

    * Clarify that core.compression provides a system-wide default to
      other compression parameters.
    
    * Explain that the default for pack.compression, -1, is "a default
      compromise between speed and compression (currently equivalent
      to level 6)" according to zlib.h.
    
    Signed-off-by: Brian Downing <bdowning@lavos.net>
    Acked-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bdowning committed with gitster Nov 19, 2007
  3. config: correct core.loosecompression documentation

    * core.loosecompression stated that the default was "0 (best speed)",
      when in fact 0 is "no compression", and the default is Z_BEST_SPEED,
      which is 1.
    
    Signed-off-by: Brian Downing <bdowning@lavos.net>
    Acked-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bdowning committed with gitster Nov 19, 2007
Commits on Nov 19, 2007
  1. Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

    * 'maint' of git://linux-nfs.org/~bfields/git:
      Documentation: Fix references to deprecated commands
      user-manual: mention "..." in "Generating diffs", etc.
      user-manual: Add section "Why bisecting merge commits can be harder ..."
      git-remote.txt: fix example url
    gitster committed Nov 19, 2007
  2. Documentation: Fix references to deprecated commands

    ... by changing git-tar-tree reference to git-archive and removing
    seemingly unrelevant footnote about git-ssh-{fetch,upload}.
    
    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    J. Bruce Fields committed Nov 19, 2007
  3. user-manual: mention "..." in "Generating diffs", etc.

    We should mention the use of the "..." syntax for git-diff here.  The
    note about the difference between diff and the combined output of
    git-format-patch then no longer fits so well, so remove it.  Add a
    reference to the git-format-patch[1] manpage.
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    J. Bruce Fields committed Nov 19, 2007
Commits on Nov 18, 2007
  1. user-manual: Add section "Why bisecting merge commits can be harder ..."

    This commit adds a discussion of the challenge of bisecting
    merge commits to the user manual.  The original author is
    Junio C Hamano <gitster@pobox.com>, who posted the text to
    the mailing list <http://marc.info/?l=git&m=119403257315527&w=2>.
    His email was adapted for the manual.
    
    The discussion is added to "Rewriting history and maintainig
    patch series".  The text added requires good understanding of
    merging and rebasing.  Therefore it should not be placed too
    early in the manual.  Right after the section on "Problems with
    rewriting history", the discussion of bisect gives another reason
    for linearizing as much of the history as possible.
    
    The text includes suggestions and fixes by
    Ralf Wildenhues <Ralf.Wildenhues@gmx.de> and
    Benoit Sigoure <tsuna@lrde.epita.fr>.
    
    Signed-off-by: Steffen Prohaska <prohaska@zib.de>
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    sprohaska committed with J. Bruce Fields Nov 10, 2007
  2. GIT 1.5.3.6

    gitster committed Nov 18, 2007