Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jul 21, 2010
  1. @gitster

    Git 1.7.2

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

    tests: correct "does reflog exist?" tests

    gitster authored
    These two tests weren't about how "git reflog show <branch>" exits when
    there is no reflog, but were about "checkout" and "branch" create or not
    create reflog when creating a new <branch>.  Update the tests to check
    what we are interested in, using "git rev-parse --verify".
    
    Also lose tests based on "test -f .git/logs/refs/heads/<branch>" from
    nearby, to avoid exposing this particular implementation detail
    unnecessarily.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @drafnel @gitster

    t/: work around one-shot variable assignment with test_must_fail

    drafnel authored gitster committed
    See e200783
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @jrn @gitster

    t/README: correct an exception when breaking a && chain in tests

    jrn authored gitster committed
    The correct advice should have been taken from c289c31 (t/t7006: ignore
    return status of shell's unset builtin, 2010-06-02).  A real-life issue
    we experienced was with "unset", not with "export" (exporting an
    unset variable may have similar portability issues, though).
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 20, 2010
  1. @drafnel @gitster

    t/{t5541,lib-httpd}: replace problematic '!()' notation with test_mus…

    drafnel authored gitster committed
    …t_fail
    
    The '!()' notation is interpreted as a pattern-list on Ksh.  The Ksh man
    page describe it as follows:
    
       !(pattern-list)
          Matches anything except one of the given patterns.
    
    Ksh performs a file glob using the pattern-list and then tries to execute
    the first file in the list.  If a space is added between the '!' and the
    open parens, then Ksh will not interpret it as a pattern list, but in this
    case, it is preferred to use test_must_fail, so lets do so.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @drafnel @gitster

    t/t3700: convert two uses of negation operator '!' to use test_must_fail

    drafnel authored gitster committed
    These two lines use the negation '!' operator to negate the result of a
    simple command.  Since these commands do not contain any pipes or other
    complexities, the test_must_fail function can be used and is preferred
    since it will additionally detect termination due to a signal.
    
    This was noticed because the second use of '!' does not include a space
    between the '!' and the opening parens.  Ksh interprets this as follows:
    
       !(pattern-list)
          Matches anything except one of the given patterns.
    
    Ksh performs a file glob using the pattern-list and then tries to execute
    the first file in the list.  If a space is added between the '!' and the
    open parens, then Ksh will not interpret it as a pattern list, but in this
    case, it is preferred to use test_must_fail, so lets do so.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      t/README: clarify test_must_fail description
      Check size of path buffer before writing into it
    
    Conflicts:
    	t/README
  4. @drafnel @gitster

    t/README: clarify test_must_fail description

    drafnel authored gitster committed
    Some have found the wording of the description to be somewhat ambiguous
    with respect to when it is desirable to use test_must_fail instead of
    "! <git-command>".  Tweak the wording somewhat to hopefully clarify that
    it is _because_ test_must_fail can detect segmentation fault that it is
    desirable to use it instead of "! <git-command>".
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @gitster

    Check size of path buffer before writing into it

    Greg Brockman authored gitster committed
    This prevents a buffer overrun that could otherwise be triggered by
    creating a file called '.git' with contents
    
      gitdir: (something really long)
    
    Signed-off-by: Greg Brockman <gdb@mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 19, 2010
  1. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      update-server-info: Shorten read_pack_info_file()
      Documentation: Explain git-mergetool's use of temporary files
  2. @ralfth @gitster

    update-server-info: Shorten read_pack_info_file()

    ralfth authored gitster committed
    The correct responses to a D and a T line in .git/objects/info/packs
    are the same, so combine their case arms.  In both cases we already
    ‘goto’ out of the switch so while at it, remove a redundant ‘break’
    to avoid yet another line of code.
    
    Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
    Reviewed-by: Jonathan Nieder <jrnieder <at> gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @avar @gitster

    git add: Add --ignore-missing to SYNOPSIS

    avar authored gitster committed
    All the git add options were listed in the synopsis until the
    --ignore-missing option was added. Change that so that the git add
    documentation now has the complete listing.
    
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @avar @gitster

    git submodule add: Remove old docs about implicit -f

    avar authored gitster committed
    git submodule add no longer implicitly adds with --force. Remove
    references to the old functionality in the documentation.
    
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @jlehmann @gitster

    git submodule add: Require the new --force option to add ignored paths

    jlehmann authored gitster committed
    To make the behavior of "git submodule add" more consistent with "git add"
    ignored submodule paths should not be silently added when they match an
    entry in a .gitignore file. To be able to override that default behavior
    in the same way as we can do that for "git add", the new option "--force"
    is introduced.
    
    Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
    Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @gitster

    Merge branch 'jl/add-n-ignore-missing'

    gitster authored
    * jl/add-n-ignore-missing:
      git add: Add the "--ignore-missing" option for the dry run
  7. @davvid @gitster

    Documentation: Explain git-mergetool's use of temporary files

    davvid authored gitster committed
    'git mergetool' creates '*.orig' backup files in its
    default configuration.  Mention this in its documentation.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. @sigprof

    git-svn: write memoized data explicitly to avoid Storable bug

    sigprof authored Eric Wong committed
    Apparently using the Storable module during global destruction is
    unsafe - there is a bug which can cause segmentation faults:
    
      http://rt.cpan.org/Public/Bug/Display.html?id=36087
      http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=482355
    
    The persistent memoization support introduced in commit 8bff7c5
    relied on global destruction to write cached data, which was leading
    to segfaults in some Perl configurations.  Calling Memoize::unmemoize
    in the END block forces the cache writeout to be performed earlier,
    thus avoiding the bug.
    
    Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
    Acked-by: Eric Wong <normalperson@yhbt.net>
Commits on Jul 16, 2010
  1. @gitster

    Merge branch 'jc/diff-merge-base-multi'

    gitster authored
    * jc/diff-merge-base-multi:
      diff A...B: do not limit the syntax too narrowly
  2. @trast @gitster

    Only run aggregate-results over actual counts

    trast authored gitster committed
    The current make target 'aggregate-results' scanned all files matching
    test-results/t*-*.  Normally these are only the test counts (and the
    exit values, which are ignored), but with --tee the suite also dumps
    all output.  Furthermore, with --verbose t1450 contains several lines
    starting with "broken link from ..." which matches the criteria used
    by aggregate-results.sh.
    
    Rename the counts output files to *.counts, and only scan those.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @jrn @gitster

    Add a sample user for the svndump library

    jrn authored gitster committed
    The svn-fe tool takes a Subversion dump file as input and produces
    a fast-import stream as output.  This can be useful as a low-level
    tool in building other importers, or for debugging the vcs-svn
    library.
    
     make svn-fe
     make svn-fe.1
    
    to test.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    diff A...B: do not limit the syntax too narrowly

    gitster authored
    Earlier we tried to make sure that the trees we get are what A...B
    syntax produced, by checking that earlier ones are all marked
    uninteresting (which has to be true as they are merge bases),
    there are two remaining ones that are interesting, and they are
    marked as non-symmetric-left and symmetric-left respectively.
    
    The "the last two must be interesting" condition is however wrong when one
    is an ancestor of the other between A and B (i.e. fast-forward).  In such
    a case, one of them is marked uninteresting.
Commits on Jul 15, 2010
  1. @gitster

    Merge branch 'jn/paginate-fix'

    gitster authored
    * jn/paginate-fix:
      git --paginate: paginate external commands again
      git --paginate: do not commit pager choice too early
      tests: local config file should be honored from subdirs of toplevel
      t7006: test pager configuration for several git commands
      t7006 (pager): introduce helper for parameterized tests
    
    Conflicts:
    	t/t7006-pager.sh
  2. @gitster

    Merge branch 'wp/merge-tree-fix'

    gitster authored
    * wp/merge-tree-fix:
      merge-tree: fix where two branches share no changes
      add basic tests for merge-tree
  3. @gitster

    Merge branch 'js/merge-rr-fix'

    gitster authored
    * js/merge-rr-fix:
      MERGE_RR is in .git, not .git/rr-cache
  4. @gitster

    Merge branch 'jc/diff-merge-base-multi'

    gitster authored
    * jc/diff-merge-base-multi:
      diff A...B: give one possible diff when there are more than one merge-base
  5. @gitster

    Merge branch 'ns/merge-recursive-uptodate'

    gitster authored
    * ns/merge-recursive-uptodate:
      merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
  6. @gitster

    Merge branch 'jn/tests'

    gitster authored
    * jn/tests:
      t3000 (ls-files -o): modernize style
  7. @gitster

    Merge branch 'eb/doc-log-manpage'

    gitster authored
    * eb/doc-log-manpage:
      Reorganize `git-log' man page to clarify common diff options.
  8. @gitster

    Merge branch 'jn/grep-open'

    gitster authored
    * jn/grep-open:
      grep -O: Do not pass color sequences as filenames to pager
  9. @gitster

    Merge branch 'mg/revision-doc'

    gitster authored
    * mg/revision-doc:
      Documentation: link to gitrevisions rather than git-rev-parse
      Documentation: gitrevisions
      Documentation: split off rev doc into include file
  10. @gitster

    Merge branch 'jk/maint-status-keep-index-timestamp'

    gitster authored
    * jk/maint-status-keep-index-timestamp:
      do not write out index when status does not have to
  11. @gitster

    Merge branch 'jc/rebase-i-commit-msg-fix'

    gitster authored
    * jc/rebase-i-commit-msg-fix:
      rebase-i: do not get fooled by a log message ending with backslash
      rebase-i: style fix
  12. @gitster

    Merge branch 'ab/submodule-add-f'

    gitster authored
    * ab/submodule-add-f:
      git submodule: add submodules with git add -f <path>
  13. @gitster

    Merge branch 'bc/maint-makefile-fixes'

    gitster authored
    * bc/maint-makefile-fixes:
      Makefile: work around ksh's failure to handle missing list argument to for loop
      Makefile: remove some unnecessary curly braces
  14. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      Documentation: add submodule.* to the big configuration variable list
      gitmodules.5: url can be a relative path
      gitweb: fix esc_url
Something went wrong with that request. Please try again.