Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Feb 28, 2010
  1. @gitster

    Git 1.7.0.1

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

    Remove reference to GREP_COLORS from documentation

    MarkLodato authored gitster committed
    There is no longer support for external grep, as per bbc09c2 (grep: rip
    out support for external grep, 2010-01-12), so remove the reference to it
    from the documentation.
    
    Signed-off-by: Mark Lodato <lodatom@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @marcows @gitster

    sha1_name: fix segfault caused by invalid index access

    marcows authored gitster committed
    The code to see if user input "git show :path" makes sense tried to access
    the index without properly checking the array bound.
    
    Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 26, 2010
  1. @gitster

    Merge branch 'maint-1.6.6' into maint

    gitster authored
    * maint-1.6.6:
      t3301-notes: insert a shbang line in ./fake_editor.sh
Commits on Feb 25, 2010
  1. @gitster

    t3301-notes: insert a shbang line in ./fake_editor.sh

    Johannes Sixt authored gitster committed
    This is required on Windows because git-notes is now a built-in
    rather than a shell script.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 24, 2010
  1. @kraai @gitster

    commit: quote the user name in the example

    kraai authored gitster committed
    If the user runs
    
     git config --global user.name Your Name
    
    as suggested, user.name will be set to "Your".  With this patch, the
    suggested command will be
    
     git config --global user.name "Your Name"
    
    which will set user.name to "Your Name" and hopefully help users avoid
    the former mistake.
    
    Signed-off-by: Matt Kraai <kraai@ftbfs.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'ml/maint-grep-doc' into maint

    gitster authored
    * ml/maint-grep-doc:
      grep documentation: clarify what files match
Commits on Feb 23, 2010
  1. @jrn @gitster

    am: remove rebase-apply directory before gc

    jrn authored gitster committed
    When git am does an automatic gc it doesn't clean up the rebase-apply
    directory until after this has finished.  This means that if the user
    aborts the gc then future am or rebase operations will report that an
    existing operation is in progress, which is undesirable and confusing.
    
    Reported by Mark Brown <broonie@debian.org> through
    http://bugs.debian.org/570966
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @bertwesarg @gitster

    rerere: fix memory leak if rerere images can't be read

    bertwesarg authored gitster committed
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @bertwesarg @gitster

    Documentation: mention conflict marker size argument (%L) for merge d…

    bertwesarg authored gitster committed
    …river
    
    
    23a64c9 (conflict-marker-size: new attribute, 2010-01-16) introduced the
    new attribute and also pass the conflict marker size as %L to merge driver
    commands. This documents the substitution.
    
    Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 20, 2010
  1. @gitster

    git-p4: fix bug in symlink handling

    Evan Powers authored gitster committed
    Fix inadvertent breakage from b932705 (git-p4: stream from perforce to
    speed up clones, 2009-07-30) in the code that strips the trailing '\n'
    from p4 print on a symlink. (In practice, contents is of the form
    ['target\n', ''].)
    
    Signed-off-by: Evan Powers <evan.powers@gmail.com>
    Acked-by: Pete Wyckoff <pw@padd.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @trast @gitster

    t1450: fix testcases that were wrongly expecting failure

    trast authored gitster committed
    Almost exactly a year ago in 02a6552 (Test fsck a bit harder), I
    introduced two testcases that were expecting failure.
    
    However, the only bug was that the testcases wrote *blobs* because I
    forgot to pass -t tag to hash-object.  Fix this, and then adjust the
    rest of the test to properly check the result.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @jhelwig @gitster

    Documentation: Fix indentation problem in git-commit(1)

    jhelwig authored gitster committed
    Ever since the "See linkgit:git-config[1]..." paragraph was added to the
    description for --untracked-files (d6293d1), the paragraphs for the
    following options were indented at the same level as the "See
    linkgit:git-config[1]" paragraph.  This problem showed up in the
    manpages, but not in the HTML documentation.
    
    While this does fix the alignment of the options following
    --untracked-files in the manpage, the "See linkgit..." portion of the
    description does not retain its previous indentation level in the
    manpages, or HTML documentation.
    
    Signed-off-by: Jacob Helwig <jacob.helwig@gmail.com>
    Acked-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 19, 2010
  1. @gitster

    Merge branch 'jk/maint-rmdir-fix' into maint

    gitster authored
    * jk/maint-rmdir-fix:
      rm: fix bug in recursive subdirectory removal
  2. @peff @gitster

    rm: fix bug in recursive subdirectory removal

    peff authored gitster committed
    If we remove a path in a/deep/subdirectory, we should try to
    remove as many trailing components as possible (i.e.,
    subdirectory, then deep, then a). However, the test for the
    return value of rmdir was reversed, so we only ever deleted
    at most one level.
    
    The fix is in remove_path, so "apply" and "merge-recursive"
    also are fixed.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @bebarino @gitster

    Documentation: describe --thin more accurately

    bebarino authored gitster committed
    The description for --thin was misleading and downright wrong. Correct
    it with some inspiration from the description of index-pack's --fix-thin
    and some background information from Nicolas Pitre <nico@fluxnic.net>.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 18, 2010
  1. @peff @gitster

    docs: don't talk about $GIT_DIR/refs/ everywhere

    peff authored gitster committed
    It is misleading to say that we pull refs from $GIT_DIR/refs/*, because we
    may also consult the packed refs mechanism. These days we tend to treat
    the "refs hierarchy" as more of an abstract namespace that happens to be
    represented as $GIT_DIR/refs. At best, this is a minor inaccuracy, but at
    worst it can confuse users who then look in $GIT_DIR/refs and find that it
    is missing some of the refs they expected to see.
    
    This patch drops most uses of "$GIT_DIR/refs/*", changing them into just
    "refs/*", under the assumption that users can handle the concept of an
    abstract refs namespace. There are a few things to note:
    
      - most cases just dropped the $GIT_DIR/ portion. But for cases where
        that left _just_ the word "refs", I changed it to "refs/" to help
        indicate that it was a hierarchy.  I didn't do the same for longer
        paths (e.g., "refs/heads" remained, instead of becoming
        "refs/heads/").
    
      - in some cases, no change was made, as the text was explicitly about
        unpacked refs (e.g., the discussion in git-pack-refs).
    
      - In some cases it made sense instead to note the existence of packed
        refs (e.g., in check-ref-format and rev-parse).
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 17, 2010
  1. @gitster

    Update 1.7.0.1 release notes

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

    Merge branch 'jk/cherry-pick-reword' into maint

    gitster authored
    * jk/cherry-pick-reword:
      cherry-pick: prettify the advice message
      cherry-pick: show commit name instead of sha1
      cherry-pick: format help message as strbuf
      cherry-pick: refactor commit parsing code
      cherry-pick: rewrap advice message
  3. @gitster

    Merge branch 'jk/grep-double-dash' into maint

    gitster authored
    * jk/grep-double-dash:
      accept "git grep -- pattern"
  4. @gitster

    Merge branch 'jc/typo' into maint

    gitster authored
    * jc/typo:
      Typofixes outside documentation area
  5. @MarkLodato @gitster

    grep documentation: clarify what files match

    MarkLodato authored gitster committed
    Clarify that git-grep(1) searches only tracked files, and that each
    <pathspec> is a pathspec, as in any other ordinary git commands.
    
    Add an example to show a simple use case for searching all .c and .h
    files in the current directory and below.
    
    Signed-off-by: Mark Lodato <lodatom@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @gitster

    Prepare 1.7.0.1 release notes

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

    Merge branch 'jc/maint-grep-one-thread-mutex-fix' into maint

    gitster authored
    * jc/maint-grep-one-thread-mutex-fix:
      Fix use of mutex in threaded grep
  8. @gitster

    Fix use of mutex in threaded grep

    gitster authored
    The program can decide at runtime not to use threading even if the support
    is compiled in.  In such a case, mutexes are not necessary and left
    uninitialized.  But the code incorrectly tried to take and release the
    read_sha1_mutex unconditionally.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Acked-by: Fredrik Kuivinen <frekui@gmail.com>
Commits on Feb 16, 2010
  1. @gitster

    Merge branch 'maint-1.6.6' into maint

    gitster authored
    * maint-1.6.6:
      dwim_ref: fix dangling symref warning
      stash pop: remove 'apply' options during 'drop' invocation
      diff: make sure --output=/bad/path is caught
      Remove hyphen from "git-command" in two error messages
  2. @gitster

    Merge branch 'maint-1.6.5' into maint-1.6.6

    gitster authored
    * maint-1.6.5:
      dwim_ref: fix dangling symref warning
      stash pop: remove 'apply' options during 'drop' invocation
      diff: make sure --output=/bad/path is caught
  3. @peff @gitster

    dwim_ref: fix dangling symref warning

    peff authored gitster committed
    If we encounter a symref that is dangling, in most cases we will warn
    about it. The one exception is a dangling HEAD, as that indicates a
    branch yet to be born.
    
    However, the check in dwim_ref was not quite right. If we were fed
    something like "HEAD^0" we would try to resolve "HEAD", see that it is
    dangling, and then check whether the _original_ string we got was
    "HEAD" (which it wasn't in this case). And that makes no sense; the
    dangling thing we found was not "HEAD^0" but rather "HEAD".
    
    Fixing this squelches a scary warning from "submodule summary HEAD" (and
    consequently "git status" with status.submodulesummary set) in an empty
    repo, as the submodule script calls "git rev-parse -q --verify HEAD^0".
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @trast @gitster

    stash pop: remove 'apply' options during 'drop' invocation

    trast authored gitster committed
    The 'git stash pop' option parsing used to remove the first argument
    in --index mode.  At the time this was implemented, this first
    argument was always --index.  However, since the invention of the -q
    option in fcdd0e9 (stash: teach quiet option, 2009-06-17) you can
    cause an internal invocation of
    
      git stash drop --index
    
    by running
    
      git stash pop -q --index
    
    which then of course fails because drop doesn't know --index.
    
    To handle this, instead let 'git stash apply' decide what the future
    argument to 'drop' should be.
    
    Warning: this means that 'git stash apply' must parse all options that
    'drop' can take, and deal with them in the same way.  This is
    currently true for its only option -q.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Acked-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @smoofra @gitster

    diff: make sure --output=/bad/path is caught

    smoofra authored gitster committed
    The return value from fopen wasn't being checked.
    
    Signed-off-by: Larry D'Anna <larry@elder-gods.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @gitster

    Remove hyphen from "git-command" in two error messages

    Pete Harlan authored gitster committed
    Signed-off-by: Pete Harlan <pgit@pcharlan.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 15, 2010
  1. @gitster

    Merge branch 'maint-1.6.6' into maint

    gitster authored
    * maint-1.6.6:
      fix minor memory leak in get_tree_entry()
Commits on Feb 14, 2010
  1. @gitster

    fix minor memory leak in get_tree_entry()

    René Scharfe authored gitster committed
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 13, 2010
  1. @gitster

    Start 1.7.0 maintenance track

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 12, 2010
  1. @gitster

    Git 1.7.0

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.