Permalink
Commits on Dec 20, 2008
  1. GIT 1.6.0.6

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 20, 2008
  2. fast-import: make tagger information optional

    Even though newer Porcelain tools always record the tagger information
    when creating new tags, export/import pair should be able to faithfully
    reproduce ancient tag objects that lack tagger information.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    gitster committed Dec 19, 2008
  3. fast-export: deal with tag objects that do not have a tagger

    When no tagger was found (old Git produced tags like this),
    no "tagger" line is printed (but this is incompatible with the current
    git fast-import).
    
    Alternatively, you can pass the option --fake-missing-tagger, forcing
    fast-export to fake a tagger
    
    	Unspecified Tagger <no-tagger>
    
    with a tag date of the beginning of (Unix) time in the case of a missing
    tagger, so that fast-import is still able to import the result.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Dec 20, 2008
  4. SubmittingPatches: mention the usage of real name in Signed-off-by: l…

    …ines
    
    Especially with something that is supposed to hopefully have some legal
    value down the line if somebody starts making noises, it really would be
    nice to have a real person to associate things with. Suggest this in the
    SubmittingPatches document.
    
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Miklos Vajna committed with gitster Dec 20, 2008
  5. git-mergetool: properly handle "git mergetool -- filename"

    Like many git commands, git-mergetool allows "--" to signal
    the end of option processing.  This adds a missing "shift"
    statement so that this is correctly handled.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    davvid committed with gitster Dec 20, 2008
  6. git-send-email: handle email address with quoted comma

    Correctly handle email addresses containing quoted commas, e.g.
    
        "Zhu, Yi" <yi.zhu@intel.com>, "Li, Shaohua" <shaohua.li@intel.com>
    
    The commas inside the double quotes are not separators.
    
    Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    fengguang committed with gitster Dec 19, 2008
  7. Documentation: fix typos, grammar, asciidoc syntax

    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    marcows committed with gitster Dec 19, 2008
Commits on Dec 17, 2008
  1. GIT 1.5.6.6

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 17, 2008
  2. GIT 1.5.5.6

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 17, 2008
  3. GIT 1.5.4.7

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 17, 2008
  4. gitweb: do not run "git diff" that is Porcelain

    Jakub says that legacy-style URI to view two blob differences are never
    generated since 1.4.3.  This codepath runs "git diff" Porcelain from the
    gitweb, which is a no-no.  It can trigger diff.external command that is
    specified in the configuration file of the repository being viewed.
    
    This patch applies to v1.5.4 and later.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 17, 2008
Commits on Dec 16, 2008
  1. fast-import: close pack before unlinking it

    This is sort of a companion patch to 4723ee9(Close files opened by
    lock_file() before unlinking.): on Windows, you cannot delete what
    is still open.
    
    This makes test 9300-fast-import pass on Windows for me; quite a few
    fast-imports leave temporary packs until the test "blank lines not
    necessary after other commands" actually tests for the number of files
    in .git/objects/pack/, which has a few temporary packs now.
    
    I guess that 8b4eb6b(Do not perform cross-directory renames when
    creating packs) was "responsible" for the breakage.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Dec 15, 2008
Commits on Dec 15, 2008
  1. pager: do not dup2 stderr if it is already redirected

    An earlier commit 61b8050 (sending errors to stdout under $PAGER,
    2008-02-16) avoided losing the error messages that are sent to the
    standard error when $PAGER is in effect by dup2'ing fd 2 to the pager.
    his way, showing a tag object that points to a bad object:
    
        $ git show tag-foo
    
    would give the error message to the pager.  However, it was not quite
    right if the user did:
    
        $ git show 2>error.log tag-foo
    
    i.e. use the pager but store the errors in a separate file.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 15, 2008
  2. git-show: do not segfault when showing a bad tag

    When a tag points at a bad or nonexistent object, we should diagnose the
    breakage and exit.  An earlier commit 4f3dcc2 (Fix 'git show' on signed
    tag of signed tag of commit, 2008-07-01) lost this check and made it
    segfault instead; not good.
    
    This fixes it.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 15, 2008
Commits on Dec 13, 2008
  1. 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. 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
  2. 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. 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. 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 7, 2008
  1. GIT 1.6.0.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 7, 2008
  2. "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
  3. 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
  4. 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
  5. http.c: use 'git_config_string' to get 'curl_http_proxy'

    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Miklos Vajna committed with gitster Dec 7, 2008
  6. fetch-pack: Avoid memcpy() with src==dst

    memcpy() may only be used for disjoint memory areas, but when invoked
    from cmd_fetch_pack(), we have my_args == &args.  (The argument cannot
    be removed entirely because transport.c invokes with its own
    variable.)
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Dec 6, 2008
Commits on Dec 3, 2008
  1. Merge branch 'jk/maint-commit-v-strip' into maint

    * jk/maint-commit-v-strip:
      commit: Fix stripping of patch in verbose mode.
    gitster committed Dec 3, 2008
  2. xdiff: give up scanning similar lines early

    In a corner case of large files whose lines do not match uniquely, the
    loop to eliminate a line that matches multiple locations adjacent to a run
    of lines that do not uniquely match wasted too much cycles.  Fix this by
    giving up early after scanning 100 lines in both direction.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    davidel committed with gitster Nov 8, 2008
  3. Merge branch 'bc/maint-keep-pack' into maint

    * bc/maint-keep-pack:
      repack: only unpack-unreachable if we are deleting redundant packs
      t7700: test that 'repack -a' packs alternate packed objects
      pack-objects: extend --local to mean ignore non-local loose objects too
      sha1_file.c: split has_loose_object() into local and non-local counterparts
      t7700: demonstrate mishandling of loose objects in an alternate ODB
      builtin-gc.c: use new pack_keep bitfield to detect .keep file existence
      repack: do not fall back to incremental repacking with [-a|-A]
      repack: don't repack local objects in packs with .keep file
      pack-objects: new option --honor-pack-keep
      packed_git: convert pack_local flag into a bitfield and add pack_keep
      t7700: demonstrate mishandling of objects in packs with a .keep file
    gitster committed Dec 3, 2008
  4. Merge branch 'js/mingw-rename-fix' into maint

    * js/mingw-rename-fix:
      compat/mingw.c: Teach mingw_rename() to replace read-only files
    gitster committed Dec 3, 2008
Commits on Dec 2, 2008
  1. User's Manual: remove duplicated url at the end of Appendix B

    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Miklos Vajna committed with gitster Dec 1, 2008
Commits on Dec 1, 2008
  1. Update draft release notes to 1.6.0.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 1, 2008
  2. Merge branch 'st/maint-tag' into maint

    * st/maint-tag:
      tag: Add more tests about mixing incompatible modes and options
      tag: Check that options are only allowed in the appropriate mode
    gitster committed Dec 1, 2008
  3. Merge branch 'mk/maint-cg-push' into maint

    * mk/maint-cg-push:
      git push: Interpret $GIT_DIR/branches in a Cogito compatible way
    gitster committed Dec 1, 2008
  4. generate-cmdlist.sh: avoid selecting synopsis at wrong place

    In "common" man pages there is luckily no "NAME" anywhere except at
    beginning of documents. If there is another "NAME", sed could
    mis-select it and lead to common-cmds.h corruption. So better nail it
    at beginning of line, which would reduce corruption chance.
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    pclouds committed with gitster Nov 30, 2008
Commits on Nov 28, 2008
  1. Merge branch 'mv/fast-export' into maint

    * mv/fast-export:
      fast-export: use an unsorted string list for extra_refs
      Add new testcase to show fast-export does not always exports all tags
    gitster committed Nov 28, 2008