Skip to content
Commits on Aug 3, 2012
  1. @moy @gitster

    git-remote-mediawiki: replace TODO-list in comment by appropriate link

    My account on Github is now used as wiki and issue tracking. This will be
    more flexible than in-tree management of a TODO-list.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    moy committed with gitster Aug 3, 2012
Commits on Aug 1, 2012
  1. @gitster

    Merge git://github.com/git-l10n/git-po

    * git://github.com/git-l10n/git-po:
      l10n: de.po: translate 4 new messages
      l10n: vi.po: translate 4 new messages
      l10n: zh_CN.po: translate 4 new messages
      l10n: Update git.pot (4 new, 3 removed messages)
    gitster committed Aug 1, 2012
  2. @ralfth @gitster

    git-rebase.sh: fix typo in an error message

    Fix a typo in the error messages which is shown if it seems that a
    rebase is already in progress.
    
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    ralfth committed with gitster Aug 1, 2012
Commits on Jul 31, 2012
  1. @gitster

    Merge branch 'nd/maint-i18n-diffstat'

    * nd/maint-i18n-diffstat:
      i18n: leave \n out of translated diffstat
    gitster committed Jul 31, 2012
  2. @gitster

    Merge branch 'jx/i18n-1.7.11'

    Add i18n support for scripted Porcelains, and mark strings in
    merge(-recursive), am, and rebase for i18n.
    
    * jx/i18n-1.7.11:
      i18n: merge-recursive: mark strings for translation
      Remove dead code which contains bad gettext block
      i18n: am: mark more strings for translation
      rebase: remove obsolete and unused LONG_USAGE which breaks xgettext
      i18n: Rewrite gettext messages start with dash
      i18n: rebase: mark messages for translation
      i18n: New keywords for xgettext extraction from sh
    gitster committed Jul 31, 2012
  3. @ralfth

    l10n: de.po: translate 4 new messages

    Translate 4 new messages came from git.pot update in 0bbe5b4
    (l10n: Update git.pot (4 new, 3 removed messages)).
    
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    ralfth committed Jul 30, 2012
  4. @vnwildman

    l10n: vi.po: translate 4 new messages

    Update Vietnamse translation to POT file in 0bbe5b4
    
    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
    vnwildman committed Jul 31, 2012
Commits on Jul 30, 2012
  1. @jiangxin

    l10n: zh_CN.po: translate 4 new messages

    Translate 4 new messages came from git.pot update in 0bbe5b4
    (l10n: Update git.pot (4 new, 3 removed messages))
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Jul 31, 2012
  2. @gitster

    Git 1.7.12-rc1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 30, 2012
  3. @gitster

    Sync with 1.7.11.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 30, 2012
  4. @gitster

    Git 1.7.11.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 30, 2012
  5. @gitster

    Merge branch 'jk/maint-commit-document-editmsg' into maint

    "$GIT_DIR/COMMIT_EDITMSG" file that is used to hold the commit log
    message user edits was not documented.
    
    * jk/maint-commit-document-editmsg:
      commit: document the temporary commit message file
    gitster committed Jul 30, 2012
  6. @gitster

    Merge branch 'jk/maint-advise-vaddf' into maint

    The advise() function did not use varargs correctly to format
    its message.
    
    * jk/maint-advise-vaddf:
      advice: pass varargs to strbuf_vaddf, not strbuf_addf
    gitster committed Jul 30, 2012
  7. @gitster

    Merge branch 'kk/maint-commit-tree' into maint

    "git commit-tree" learned a more natural "-p <parent> <tree>" order
    of arguments long time ago, but recently forgot it by mistake.
    
    * kk/maint-commit-tree:
      Revert "git-commit-tree(1): update synopsis"
      commit-tree: resurrect command line parsing updates
    gitster committed Jul 30, 2012
  8. @gitster

    Merge branch 'jv/maint-no-ext-diff' into maint

    "git diff --no-ext-diff" did not output anything for a typechange
    filepair when GIT_EXTERNAL_DIFF is in effect.
    
    * jv/maint-no-ext-diff:
      diff: test precedence of external diff drivers
      diff: correctly disable external_diff with --no-ext-diff
    gitster committed Jul 30, 2012
  9. @gitster

    Merge branch 'pg/maint-1.7.9-am-where-is-patch' into maint

    When "git am" failed, old timers knew to check .git/rebase-apply/patch
    to see what went wrong, but we never told the users about it.
    
    * pg/maint-1.7.9-am-where-is-patch:
      am: indicate where a failed patch is to be found
    gitster committed Jul 30, 2012
  10. @gitster

    Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into m…

    …aint
    
    When "git submodule add" clones a submodule repository, it can get
    confused where to store the resulting submodule repository in the
    superproject's .git/ directory when there is a symbolic link in the
    path to the current directory.
    
    * jl/maint-1.7.10-recurse-submodules-with-symlink:
      submodules: don't stumble over symbolic links when cloning recursively
    gitster committed Jul 30, 2012
  11. @gitster

    Merge branch 'jc/maint-filter-branch-epoch-date' into maint

    In 1.7.9 era, we taught "git rebase" about the raw timestamp format
    but we did not teach the same trick to "filter-branch", which rolled
    a similar logic on its own.
    
    * jc/maint-filter-branch-epoch-date:
      t7003: add test to filter a branch with a commit at epoch
      date.c: Fix off by one error in object-header date parsing
      filter-branch: do not forget the '@' prefix to force git-timestamp
    gitster committed Jul 30, 2012
  12. @gitster

    Merge branch 'rj/maint-grep-remove-redundant-test'

    "git grep" stopped spawning an external "grep" long time ago, but a
    duplicated test to check internal and external "grep" was left
    behind.
    
    * rj/maint-grep-remove-redundant-test:
      t7810-*.sh: Remove redundant test
    gitster committed Jul 30, 2012
  13. @gitster

    Merge branch 'dg/submodule-in-dismembered-working-tree'

    Finishing touches to the new test script.
    
    * dg/submodule-in-dismembered-working-tree:
      t7409: make sure submodule is initialized and updated in more detail
    gitster committed Jul 30, 2012
  14. @dangra @gitster

    t7409: make sure submodule is initialized and updated in more detail

    The earlier test did not even make sure that the correct commit is
    checked out in the submodule directory.  Inspect the result in a bit
    more detail.
    
    Signed-off-by: Daniel Graña <dangra@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dangra committed with gitster Jul 30, 2012
  15. @gitster

    Merge branch 'hv/link-alt-odb-entry'

    The code to avoid mistaken attempt to add the object directory
    itself as its own alternate could read beyond end of a string while
    comparison.
    
    * hv/link-alt-odb-entry:
      link_alt_odb_entry: fix read over array bounds reported by valgrind
    gitster committed Jul 30, 2012
  16. @flyingflo @gitster

    Add explanatory comment for transport-helpers refs mapping.

    The patch below adds a comment to fetch_with_import() explaining the
    loop that saves the fetched commit names after 'git fast-import' has
    done its work.  It avoids some confusion about which refs the
    fast-import stream is supposed to use to write its result.
    
    Signed-off-by: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
    Helped-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    flyingflo committed with gitster Jul 30, 2012
  17. @jiangxin

    l10n: Update git.pot (4 new, 3 removed messages)

    Generate po/git.pot from v1.7.12-rc0-54-g9e211, and there are 4 new,
    3 removed l10n messages.
    
     * 4 new messages are added at lines:
       1254, 1264, 1459, 1523
    
     * 3 old messages are deleted from the previous version at lines:
       1254, 1273, 2854
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Jul 30, 2012
  18. @gitster

    t7810-*.sh: Remove redundant test

    Since commit bbc09c2 ("grep: rip out support for external grep",
    12-01-2010), test number 60 ("grep -C1 hunk mark between files") is
    essentially the same as test number 59.
    
    Test 59 was intended to verify the behaviour of git-grep resulting
    from multiple invocations of an external grep. As part of the test,
    it creates and adds 1024 files to the index, which is now wasted
    effort.
    
    Remove test 59, since it is now redundant.
    
    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Ramsay Jones committed with gitster Jul 28, 2012
  19. @gitster

    t1100-*.sh: Fix an intermittent test failure

    In particular, the final test ('flags and then non flags') fails
    intermittently, depending on how much time elapsed between the
    invocations of "git commit-tree" when creating the commits which
    later have their commit id's compared. For example, if the commits
    for childid-3 and childid-4 are created 1 or more seconds apart,
    then the commits, which would otherwise be identical, will have
    different commit id's.
    
    In order to make the test reproducible, we remove the variability
    by setting the author and committer times to a well defined state.
    We accomplish this with a single call to 'test_tick' at the start
    of the test.
    
    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Ramsay Jones committed with gitster Jul 28, 2012
  20. @gitster

    link_alt_odb_entry: fix read over array bounds reported by valgrind

    pfxlen can be longer than the path in objdir when relative_base
    contains the path to gits object directory.  Here we are interested
    in checking if ent->base[] (the part that corresponds to .git/objects)
    is the same string as objdir, and the code NUL-terminated ent->base[]
    to
    
    	LEADING PATH\0XX/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX\0
    
    in preparation for these "duplicate check" step (before we return
    from the function, the first NUL is turned into '/' so that we can
    fill XX when probing for loose objects).  All we need to do is to
    compare the string with the path to our object directory.
    
    Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Heiko Voigt committed with gitster Jul 28, 2012
Commits on Jul 29, 2012
  1. @peff @gitster

    t: add missing executable bit to t7409

    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Jul 28, 2012
Commits on Jul 28, 2012
  1. @gitster

    Update draft release notes to 1.7.12

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 27, 2012
  2. @gitster

    Merge branch 'extract-remaining' of git://git.bogomips.org/git-svn

    * 'extract-remaining' of git://git.bogomips.org/git-svn:
      Extract Git::SVN::GlobSpec from git-svn.
      Move Git::IndexInfo into its own file.
      Load all the modules in one place and before running code.
      Extract Git::SVN::Migration from git-svn.
      Prepare Git::SVN::Migration for extraction from git-svn.
      Extract Git::SVN::Log from git-svn.
      Prepare Git::SVN::Log for extraction from git-svn.
    gitster committed Jul 27, 2012
  3. @gitster

    Merge git://git.bogomips.org/git-svn

    * git://git.bogomips.org/git-svn:
      Move initialization of Git::SVN variables into Git::SVN.
      Extract Git::SVN from git-svn into its own .pm file.
      Prepare Git::SVN for extraction into its own file.
      Extract some utilities from git-svn to allow extracting Git::SVN.
      perl: detect new files in MakeMaker builds
      The Makefile.PL will now find .pm files itself.
      Don't lose Error.pm if $@ gets clobbered.
      Quiet warning if Makefile.PL is run with -w and no --localedir
    gitster committed Jul 27, 2012
  4. @gitster

    Merge branch 'jk/autoident-test'

    Fix test breakages by a builder who does not have a valid user name
    in his /etc/password entry.
    
    * jk/autoident-test:
      t7502: test early quit from commit with bad ident
      t7502: handle systems where auto-identity is broken
      t7502: drop confusing test_might_fail call
      t7502: narrow checks for author/committer name in template
      t7502: properly quote GIT_EDITOR
      t7502: clean up fake_editor tests
    gitster committed Jul 27, 2012
  5. @gitster

    Merge branch 'jk/help-plug-memleak'

    Plug a few trivial memory leaks.
    
    * jk/help-plug-memleak:
      help.c::exclude_cmds(): plug a leak
      help.c::uniq: plug a leak
    gitster committed Jul 27, 2012
  6. @gitster

    Merge branch 'dg/submodule-in-dismembered-working-tree'

    In a superproject that has repository outside of its working tree,
    "git submodule add" failed to clone a new submodule, as GIT_DIR and
    GIT_WORK_TREE environment variables necessary to work in such a
    superproject interfered with access to the submodule repository.
    
    * dg/submodule-in-dismembered-working-tree:
      git-submodule: work with GIT_DIR/GIT_WORK_TREE
    gitster committed Jul 27, 2012
  7. @gitster

    Merge branch 'jk/maint-checkout-orphan-check-fix'

    "git checkout <branchname>" to come back from a detached HEAD state
    incorrectly computed reachability of the detached HEAD, resulting in
    unnecessary warnings.
    
    * jk/maint-checkout-orphan-check-fix:
      checkout: don't confuse ref and object flags
    gitster committed Jul 27, 2012
Something went wrong with that request. Please try again.