Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Tag: v1.6.0.5
Commits on Dec 7, 2008
  1. @gitster

    GIT 1.6.0.5

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @mattmccutchen @gitster

    "git diff <tree>{3,}": do not reverse order of arguments

    mattmccutchen authored gitster committed
    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>
  3. @peff @gitster

    tag: delete TAG_EDITMSG only on successful tag

    peff authored gitster committed
    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>
  4. @jnareb @gitster

    gitweb: Make project specific override for 'grep' feature work

    jnareb authored gitster committed
    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>
  5. @gitster

    http.c: use 'git_config_string' to get 'curl_http_proxy'

    Miklos Vajna authored gitster committed
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @trast @gitster

    fetch-pack: Avoid memcpy() with src==dst

    trast authored gitster committed
    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>
Commits on Dec 3, 2008
  1. @gitster

    Merge branch 'jk/maint-commit-v-strip' into maint

    gitster authored
    * jk/maint-commit-v-strip:
      commit: Fix stripping of patch in verbose mode.
  2. @davidel @gitster

    xdiff: give up scanning similar lines early

    davidel authored gitster committed
    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>
  3. @gitster

    Merge branch 'bc/maint-keep-pack' into maint

    gitster authored
    * 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
  4. @gitster

    Merge branch 'js/mingw-rename-fix' into maint

    gitster authored
    * js/mingw-rename-fix:
      compat/mingw.c: Teach mingw_rename() to replace read-only files
Commits on Dec 2, 2008
  1. @gitster

    User's Manual: remove duplicated url at the end of Appendix B

    Miklos Vajna authored gitster committed
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 1, 2008
  1. @gitster

    Update draft release notes to 1.6.0.5

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'st/maint-tag' into maint

    gitster authored
    * st/maint-tag:
      tag: Add more tests about mixing incompatible modes and options
      tag: Check that options are only allowed in the appropriate mode
  3. @gitster

    Merge branch 'mk/maint-cg-push' into maint

    gitster authored
    * mk/maint-cg-push:
      git push: Interpret $GIT_DIR/branches in a Cogito compatible way
  4. @pclouds @gitster

    generate-cmdlist.sh: avoid selecting synopsis at wrong place

    pclouds authored gitster committed
    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>
Commits on Nov 28, 2008
  1. @gitster

    Merge branch 'mv/fast-export' into maint

    gitster authored
    * 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
  2. @samv @gitster

    sha1_file.c: resolve confusion EACCES vs EPERM

    samv authored gitster committed
    An earlier commit 916d081 (Nicer error messages in case saving an object
    to db goes wrong, 2006-11-09) confused EACCES with EPERM, the latter of
    which is an unlikely error from mkstemp().
    
    Signed-off-by: Sam Vilain <sam@vilain.net>
  3. @joeyh @gitster

    sha1_file: avoid bogus "file exists" error message

    joeyh authored gitster committed
    This avoids the following misleading error message:
    
    error: unable to create temporary sha1 filename ./objects/15: File exists
    
    mkstemp can fail for many reasons, one of which, ENOENT, can occur if
    the directory for the temp file doesn't exist. create_tmpfile tried to
    handle this case by always trying to mkdir the directory, even if it
    already existed. This caused errno to be clobbered, so one cannot tell
    why mkstemp really failed, and it truncated the buffer to just the
    directory name, resulting in the strange error message shown above.
    
    Note that in both occasions that I've seen this failure, it has not been
    due to a missing directory, or bad permissions, but some other, unknown
    mkstemp failure mode that did not occur when I ran git again. This code
    could perhaps be made more robust by retrying mkstemp, in case it was a
    transient failure.
    
    Signed-off-by: Joey Hess <joey@kitenet.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @mattmccutchen @gitster

    git checkout: don't warn about unborn branch if -f is already passed

    mattmccutchen authored gitster committed
    I think it's unnecessary to warn that the checkout has been forced due to an
    unborn current branch if -f has been explicitly passed.  For one project, I am
    using git-new-workdir to create workdirs from a bare repository whose HEAD is
    set to an unborn branch, and this warning started to irritate me.
    
    Signed-off-by: Matt McCutchen <matt@mattmccutchen.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @szeder @gitster

    bash: offer refs instead of filenames for 'git revert'

    szeder authored gitster committed
    The completion script for 'git revert' currently offers options and
    filenames.  However, 'git revert' doesn't take any filenames from the
    command line, but a single commit.  Therefore, it's more sane to offer
    refs instead.
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @szeder @gitster

    bash: remove dashed command leftovers

    szeder authored gitster committed
    Commit 5a625b0 (bash: remove fetch, push, pull dashed form leftovers,
    2008-10-03) did that already, but there were still some git-cmd left
    here and there.
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 27, 2008
  1. @gitster

    Merge branch 'pw/maint-p4' into maint

    gitster authored
    * pw/maint-p4:
      git-p4: fix keyword-expansion regex
  2. @gitster

    git-p4: fix keyword-expansion regex

    Pete Wyckoff authored gitster committed
    This text:
    
         my $dir = $File::Find::dir;
         return if ($dir !~ m,$options->{dirpat}$,);
    
    was improperly converted to:
    
         my $dir = $File$dir !~ m,$options->{dirpat}$,);
    
    by the keyword identifier expansion code.  Add a \n
    to make sure the regex doesn't go across end-of-line
    boundaries.
    
    Signed-off-by: Pete Wyckoff <pw@padd.com>
    Acked-by: Simon Hausmann <simon@lst.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Fix typos in the documentation.

    Ralf Wildenhues authored gitster committed
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 26, 2008
  1. @gitster

    Merge branch 'mm/maint-sort-config-doc' into maint

    gitster authored
    * mm/maint-sort-config-doc:
      config.txt: alphabetize configuration sections
  2. @mattmccutchen @gitster

    config.txt: alphabetize configuration sections

    mattmccutchen authored gitster committed
    I figured the sections might as well be in some order, so I chose alphabetical
    but with "core" at the beginning.  This should help people add new variables
    in the right places.
    
    Signed-off-by: Matt McCutchen <matt@mattmccutchen.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Teach "git diff" to honour --[no-]ext-diff

    gitster authored
    The original intention of 72909be (Add diff-option --ext-diff, 2007-06-30)
    was to optionally allow the use of external diff viewer in "git log"
    family (while keeping them disabled by default).  It exposed the "allow
    external diff" bit to the UI, but forgot to adjust the "git diff" codepath
    that was set up to always allow use of the external diff viewer.
    
    Noticed by Nazri Ramliy; tests by René Scharfe squashed in.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 24, 2008
  1. @dscho @gitster

    fast-export: use an unsorted string list for extra_refs

    dscho authored gitster committed
    The list extra_refs contains tags and the objects referenced by them,
    so that they can be handled at the end.  When a tag references a
    commit, that commit is added to the list using the same name.
    
    Also, the function handle_tags_and_duplicates() relies on the order
    the items were added to extra_refs, so clearly we do not want to
    use a sorted list here.
    
    Noticed by Miklos Vajna.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Tested-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Add new testcase to show fast-export does not always exports all tags

    Miklos Vajna authored gitster committed
    Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @bdrewery @gitster

    Fix misleading wording for git-cherry-pick

    bdrewery authored gitster committed
    Documentation for -n implies that -x is normally
    used, however this is no longer true.
    
    Signed-off-by: Bryan Drewery <bryan@shatow.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    compat/mingw.c: Teach mingw_rename() to replace read-only files

    Johannes Sixt authored gitster committed
    On POSIX, rename() can replace files that are not writable. On Windows,
    however, read-only files cannot be replaced without additional efforts:
    We have to make the destination writable first.
    
    Since the situations where the destination is read-only are rare, we do not
    make the destination writable on every invocation, but only if the first
    try to rename a file failed with an "access denied" error.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 17, 2008
  1. @gitster

    request-pull: make usage string match manpage

    Stefan Naewe authored gitster committed
    The usage string of 'git request-pull' differs from he manpage
    which gives the correct 'synopsis'.
    
    Signed-off-by: Stefan Naewe <stefan.naewe@atlas-elektronik.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 16, 2008
  1. @gitster

    Teach ls-files --with-tree=<tree> to work with options other than -c

    gitster authored
    Originally --with-tree=<tree> was designed for the sole purpose of
    checking if a given pathspec makes sense as a parameter to git-commit
    using it in conjunction with --error-unmatch.  It had logic to avoid
    showing the same entry (one came from the original index, another from the
    overlayed tree) twice so that it works with -c (i.e. "show-cached"), but
    otherwise it was not designed to work with the flags such as -m, -d, etc.
    
    This teaches the same logic to cover the codepath for -m and -d.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    builtin-ls-files.c: coding style fix.

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 15, 2008
  1. @jast @gitster

    Documentation: git-svn: fix example for centralized SVN clone

    jast authored gitster committed
    The example that tells users how to centralize the effort of the initial
    git svn clone operation doesn't work properly. It uses rebase but that
    only works if HEAD exists. This adds one extra command to create a
    somewhat sensible HEAD that should work in all cases.
    
    Signed-off-by: Jan Krüger <jk@jk.gs>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.