Permalink
Commits on Dec 15, 2008
  1. Get rid of the last remnants of GIT_CONFIG_LOCAL

    In dc87183(Only use GIT_CONFIG in "git config", not other programs),
    GIT_CONFIG_LOCAL was rested in peace, in favor of not reading
    /etc/gitconfig and $HOME/.gitconfig at all when GIT_CONFIG is set.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Dec 14, 2008
  2. Documentation: Describe git-gui Tools menu configuration options.

    Now git gui has a customizable Tools menu, so this adds
    information about variables that are used to configure it.
    
    Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    angavrilov committed with gitster Dec 14, 2008
  3. git-fast-import possible memory corruption problem

    Internal "allocate in bulk, we will never free this memory anyway"
    allocator used in fast-import had a logic to round up the size of the
    requested memory block in a wrong place (it computed if the available
    space is enough to fit the request first, and then carved a chunk of
    memory by size rounded up to the alignment, which could go beyond the
    actually available space).
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    YONETANI Tomokazu committed with gitster Dec 14, 2008
Commits on Dec 13, 2008
  1. builtin-commit: remove unused message variable

    builtin-commit uses commit_tree() from builtin-commit-tree since
    6bb6b03 (builtin-commit: use commit_tree(), 2008-09-10), where the
    same message is used.
    
    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    marcows committed with gitster Dec 13, 2008
  2. Merge branch 'maint'

    * maint:
      git-config.txt: fix a typo
    gitster committed Dec 13, 2008
  3. git-branch: display sha1 on branch deletion

    Make it easier to recover from a mistaken branch deletion by displaying the
    sha1 of the branch's tip commit.
    
    Update t3200 test to match the change in output.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Brandon Casey committed with gitster Dec 12, 2008
  4. git-config.txt: fix a typo

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    meyering committed with gitster Dec 12, 2008
Commits on Dec 11, 2008
  1. Merge branch 'maint'

    * maint:
      fsck: reduce stack footprint
      make sure packs to be replaced are closed beforehand
    gitster committed Dec 11, 2008
  2. fsck: reduce stack footprint

    The logic to mark all objects that are reachable from tips of refs were
    implemented as a set of recursive functions.  In a repository with a deep
    enough history, this can easily eat up all the available stack space.
    
    Restructure the code to require less stackspace by using an object array
    to keep track of the objects that still need to be processed.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    torvalds committed with gitster Dec 11, 2008
  3. rebase: improve error messages about dirty state

    If you have unstaged changes in your working tree and try to
    rebase, you will get the cryptic "foo: needs update"
    message, but nothing else.  If you have staged changes, you
    get "your index is not up-to-date".
    
    Let's improve this situation in two ways:
    
     - for unstaged changes, let's also tell them we are
       canceling the rebase, and why (in addition to the "needs
       update" lines)
    
     - for the staged changes case, let's use language that is a
       little more clear to the user: their index contains
       uncommitted changes
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Dec 10, 2008
  4. make sure packs to be replaced are closed beforehand

    Especially on Windows where an opened file cannot be replaced, make
    sure pack-objects always close packs it is about to replace. Even on
    non Windows systems, this could save potential bad results if ever
    objects were to be read from the new pack file using offset from the old
    index.
    
    This should fix t5303 on Windows.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Tested-by: Johannes Sixt <j6t@kdbg.org> (MinGW)
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Nicolas Pitre committed with gitster Dec 9, 2008
Commits on Dec 10, 2008
  1. Fix typo in comment in builtin-add.c

    Reported-by: Tim Daly <daly@axiom-developer.org>
    Signed-off-by: Alexander Potashev <aspotashev@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    aspotashev committed with gitster Dec 10, 2008
  2. Fix t4031

    When I tweaked the patch to use $SHELL_PATH instead of a hard-coded
    "#!/bin/sh" to produce 3aa1f7c (diff: respect textconv in rewrite diffs,
    2008-12-09), I screwed up.  This should fix it.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 10, 2008
  3. Merge branch 'maint'

    * maint:
      work around Python warnings from AsciiDoc
      git-svn: Make following parents atomic
    gitster committed Dec 10, 2008
  4. diff: respect textconv in rewrite diffs

    Currently we just skip rewrite diffs for binary files; this
    patch makes an exception for files which will be textconv'd,
    and actually performs the textconv before generating the
    diff.
    
    Conceptually, rewrite diffs should be in the exact same
    format as the a non-rewrite diff, except that we refuse to
    share any context. Thus it makes very little sense for "git
    diff" to show a textconv'd diff, but for "git diff -B" to
    show "Binary files differ".
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Dec 9, 2008
  5. diff: fix handling of binary rewrite diffs

    The current emit_rewrite_diff code always writes a text patch without
    checking whether the content is binary. This means that if you end up with
    a rewrite diff for a binary file, you get lots of raw binary goo in your
    patch.
    
    Instead, if we have binary files, then let's just skip emit_rewrite_diff
    altogether. We will already have shown the "dissimilarity index" line, so
    it is really about the diff contents. If binary diffs are turned off, the
    "Binary files a/file and b/file differ" message should be the same in
    either case. If we do have binary patches turned on, there isn't much
    point in making a less-efficient binary patch that does a total rewrite;
    no human is going to read it, and since binary patches don't apply with
    any fuzz anyway, the result of application should be the same.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Dec 9, 2008
  6. Fix typos in documentation

    Signed-off-by: Alexander Potashev <aspotashev@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    aspotashev committed with gitster Dec 9, 2008
  7. git-p4: Fix regression in p4Where method.

    Unfortunately, I introduced a bug in commit 7f705dc (git-p4: Fix bug in
    p4Where method). This happens because sometimes the result from
    "p4 where <somepath>" doesn't contain a "depotFile" key, but instead a
    "data" key that needs further parsing. This commit should ensure that both
    of these cases are checked.
    
    Signed-off-by: Tor Arvid Lund <torarvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    torarvid committed with gitster Dec 9, 2008
  8. Improve language in git-merge.txt and related docs

    Improve some minor language and format issues like hyphenation,
    phrases, spacing, word order, comma, attributes.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Ralf Wildenhues committed with gitster Dec 9, 2008
  9. work around Python warnings from AsciiDoc

    It appears that a reference to an anchor defined as [[anchor-name]] from
    another place using <<anchor-name>> syntax, when the anchor name contains
    a string "-with-" in its name, triggers these warnings from Python
    interpreter.
    
      asciidoc -b docbook -d book user-manual.txt
      <string>:1: Warning: 'with' will become a reserved keyword in Python 2.6
      <string>:1: Warning: 'with' will become a reserved keyword in Python 2.6
      <string>:1: Warning: 'with' will become a reserved keyword in Python 2.6
      <string>:1: Warning: 'with' will become a reserved keyword in Python 2.6
    
    There currently is no reference to "Finding comments with given content",
    but for consistency and for futureproofing, the anchor is also updated as
    the other ones that are actually used and trigger these warnings.
    
    Signed-off-by: Junio C Hamano <junio@pobox.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Junio C Hamano committed with gitster Dec 8, 2008
Commits on Dec 9, 2008
  1. Define linkgit macro in [macros] section

    Starting with asciidoc 8.3.0 linkgit macro is no longer recognized by
    asciidoc and user guide suggests
    (http://www.methods.co.nz/asciidoc/userguide.html#_macro_definitions)
    that macros are supposed to be defined in [macros] section. I'm not
    sure whether undefined linkgit macro was working by pure chance or it
    is a regression in asciidoc 8.3.0, but this patch adds proper
    definition for the linkgit macro, allowing it to work on 8.3.0.
    
    Signed-off-by: Alexey Borzenkov <snaury@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    snaury committed with gitster Dec 8, 2008
  2. git-svn: Make following parents atomic

    find_parent_branch generates branch@rev type branches when one has to
    look back through SVN history to properly get the history for a branch
    copied from somewhere not already being tracked by git-svn.  If in the
    process of fetching this history, git-svn is interrupted, then when one
    fetches again, it will use whatever was last fetched as the parent
    commit and fail to fetch any more history which it didn't get to before
    being terminated.  This is especially troubling in that different
    git-svn copies of the same SVN repository can end up with different
    commit sha1s, incorrectly showing the history as divergent and
    precluding easy collaboration using git push and fetch.
    
    To fix this, when we initialise the Git::SVN object $gs to search for
    and perhaps fetch history, we check if there are any commits in SVN in
    the range between the current revision $gs is at, and the top revision
    for which we were asked to fill history.  If there are commits we're
    missing in that range, we continue the fetch from the current revision
    to the top, properly getting all history before using it as the parent
    for the branch we're trying to create.
    
    Signed-off-by: Deskin Miller <deskinm@umich.edu>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    deskin committed with gitster Dec 8, 2008
Commits on Dec 8, 2008
  1. gitweb: Fix bug in insert_file() subroutine

    In insert_file() subroutine (which is used to insert HTML fragments as
    custom header, footer, hometext (for projects list view), and per
    project README.html (for summary view)) we used:
    
         map(to_utf8, <$fd>);
    
    This doesn't work, and other form has to be used:
    
         map { to_utf8($_) } <$fd>;
    
    Now with test for t9600 added, for $GIT_DIR/README.html.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jnareb committed with gitster Dec 8, 2008
  2. diff: allow turning on textconv explicitly for plumbing

    Some history viewers use the diff plumbing to generate diffs
    rather than going through the "git diff" porcelain.
    Currently, there is no way for them to specify that they
    would like to see the text-converted version of the diff.
    
    This patch adds a "--textconv" option to allow such a
    plumbing user to allow text conversion.  The user can then
    tell the viewer whether or not they would like text
    conversion enabled.
    
    While it may be tempting add a configuration option rather
    than requiring each plumbing user to be configured to pass
    --textconv, that is somewhat dangerous. Text-converted diffs
    generally cannot be applied directly, so each plumbing user
    should "opt in" to generating such a diff, either by
    explicit request of the user or by confirming that their
    output will not be fed to patch.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Dec 8, 2008
  3. reorder ALLOW_TEXTCONV option setting

    Right now for the diff porcelain and the log family, we
    call:
    
      init_revisions();
      setup_revisions();
      DIFF_OPT_SET(ALLOW_TEXTCONV);
    
    However, that means textconv will _always_ be on, instead of
    being a default that can be manipulated with
    setup_revisions. Instead, we want:
    
      init_revisions();
      DIFF_OPT_SET(ALLOW_TEXTCONV);
      setup_revisions();
    
    which is what this patch does.
    
    We'll go ahead and move the callsite in wt-status, also;
    even though the user can't pass any options here, it is a
    cleanup that will help avoid any surprise later if the
    setup_revisions line is changed.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Dec 8, 2008
  4. read-cache.c: typofix in comment

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 6, 2008
  5. builtin-checkout.c: check error return from read_cache()

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 6, 2008
  6. Point "stale" 1.6.0.5 documentation from the main git documentation page

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 8, 2008
  7. Revert "git-stash: use git rev-parse -q"

    This reverts commit 757c7f6 as an
    unnecessary error message to pop up when the last stash entry is dropped.
    
    It simply is not worth the aggravation.
    gitster committed Dec 8, 2008
Commits on Dec 7, 2008
  1. Update draft release notes for 1.6.1

    A handful of fixes have been backmerged to 'maint' and are now contained
    in 1.6.0.X series as the result, so drop them from this document.
    
    Also contains typofix and duplicate removal pointed out by
    Bjørn Lindeijer and Jakub Narebski.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 7, 2008
  2. Merge branch 'maint'

    * maint:
      GIT 1.6.0.5
      "git diff <tree>{3,}": do not reverse order of arguments
      tag: delete TAG_EDITMSG only on successful tag
      gitweb: Make project specific override for 'grep' feature work
      http.c: use 'git_config_string' to get 'curl_http_proxy'
      fetch-pack: Avoid memcpy() with src==dst
    gitster committed Dec 7, 2008
  3. GIT 1.6.0.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 7, 2008
  4. "git diff <tree>{3,}": do not reverse order of arguments

    According to the message of commit 0fe7c1d,
    "git diff" with three or more trees expects the merged tree first followed by
    the parents, in order.  However, this command reversed the order of its
    arguments, resulting in confusing diffs.  A comment /* Again, the revs are all
    reverse */ suggested there was a reason for this, but I can't figure out the
    reason, so I removed the reversal of the arguments.  Test case included.
    
    Signed-off-by: Matt McCutchen <matt@mattmccutchen.net>
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    mattmccutchen committed with gitster Oct 11, 2008
  5. tag: delete TAG_EDITMSG only on successful tag

    The user may put some effort into writing an annotated tag
    message. When the tagging process later fails (which can
    happen fairly easily, since it may be dependent on gpg being
    correctly configured and used), there is no record left on
    disk of the tag message.
    
    Instead, let's keep the TAG_EDITMSG file around until we are
    sure the tag has been created successfully. If we die
    because of an error, the user can recover their text from
    that file. Leaving the file in place causes no conflicts;
    it will be silently overwritten by the next annotated tag
    creation.
    
    This matches the behavior of COMMIT_EDITMSG, which stays
    around in case of error.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Dec 6, 2008
  6. gitweb: Make project specific override for 'grep' feature work

    The 'grep' feature was marked in the comments as having project
    specific config, but it lacked 'sub' key required for it to work.
    
    Kind-of-Noticed-by: Matt Kraai <kraai@ftbfs.org>
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jnareb committed with gitster Dec 7, 2008