Permalink
Commits on Jul 30, 2012
  1. Git 1.7.12-rc1

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

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

    gitster committed Jul 30, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Merge branch 'jk/maint-commit-document-editmsg' into maint

    gitster committed Jul 30, 2012
    "$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
  5. Merge branch 'jk/maint-advise-vaddf' into maint

    gitster committed Jul 30, 2012
    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
  6. Merge branch 'kk/maint-commit-tree' into maint

    gitster committed Jul 30, 2012
    "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
  7. Merge branch 'jv/maint-no-ext-diff' into maint

    gitster committed Jul 30, 2012
    "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
  8. Merge branch 'pg/maint-1.7.9-am-where-is-patch' into maint

    gitster committed Jul 30, 2012
    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
  9. Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into m…

    gitster committed Jul 30, 2012
    …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
  10. Merge branch 'jc/maint-filter-branch-epoch-date' into maint

    gitster committed Jul 30, 2012
    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
  11. Merge branch 'rj/maint-grep-remove-redundant-test'

    gitster committed Jul 30, 2012
    "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
  12. Merge branch 'dg/submodule-in-dismembered-working-tree'

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

    dangra committed with gitster Jul 30, 2012
    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>
  14. Merge branch 'hv/link-alt-odb-entry'

    gitster committed Jul 30, 2012
    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
  15. Add explanatory comment for transport-helpers refs mapping.

    flyingflo committed with gitster Jul 30, 2012
    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>
  16. t7810-*.sh: Remove redundant test

    Ramsay Jones committed with gitster Jul 28, 2012
    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>
  17. t1100-*.sh: Fix an intermittent test failure

    Ramsay Jones committed with gitster Jul 28, 2012
    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>
  18. link_alt_odb_entry: fix read over array bounds reported by valgrind

    hvoigt committed with gitster Jul 28, 2012
    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>
Commits on Jul 29, 2012
  1. t: add missing executable bit to t7409

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

    gitster committed Jul 28, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'extract-remaining' of git://git.bogomips.org/git-svn

    gitster committed Jul 28, 2012
    * '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.
  3. Merge git://git.bogomips.org/git-svn

    gitster committed Jul 28, 2012
    * 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
  4. Merge branch 'jk/autoident-test'

    gitster committed Jul 28, 2012
    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
  5. Merge branch 'jk/help-plug-memleak'

    gitster committed Jul 28, 2012
    Plug a few trivial memory leaks.
    
    * jk/help-plug-memleak:
      help.c::exclude_cmds(): plug a leak
      help.c::uniq: plug a leak
  6. Merge branch 'dg/submodule-in-dismembered-working-tree'

    gitster committed Jul 28, 2012
    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
  7. Merge branch 'jk/maint-checkout-orphan-check-fix'

    gitster committed Jul 28, 2012
    "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
Commits on Jul 27, 2012
  1. Extract Git::SVN::GlobSpec from git-svn.

    schwern committed with Eric Wong Jul 27, 2012
    Straight cut & paste.  That's the last class.
    
    * Make Git::SVN load it on its own, its the only thing that needs it.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
  2. Move Git::IndexInfo into its own file.

    schwern committed with Eric Wong Jul 27, 2012
    Straight cut & paste.  Didn't require any fixing.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
  3. Load all the modules in one place and before running code.

    schwern committed with Eric Wong Jul 27, 2012
    Just makes the code easier to follow.  No functional change.
    
    Also eliminate an unused lexical $SVN.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
  4. Extract Git::SVN::Migration from git-svn.

    schwern committed with Eric Wong Jul 27, 2012
    Straight cut & paste.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
  5. Prepare Git::SVN::Migration for extraction from git-svn.

    schwern committed with Eric Wong Jul 27, 2012
    * Load Git command functions on its own.
    * Load Git::SVN modules on its own.
    
    Drive by refactorings...
    * Use our() instead of use vars.
    * Eliminate the auto loading of Git functions.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
  6. Extract Git::SVN::Log from git-svn.

    schwern committed with Eric Wong Jul 27, 2012
    Straight cut & paste.
    
    Also noticed Git::SVN::Ra wasn't in the compile test.  It is now.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
  7. Prepare Git::SVN::Log for extraction from git-svn.

    schwern committed with Eric Wong Jul 27, 2012
    * Load Git command functions itself.
    
    * Can't access the git-svn switch lexical any more, but its only used by
      Git::SVN::Log so turn it into a Git::SVN::Log global.
    
    * Load Git::SVN as needed.  No need to load it always, its only used twice.
    
    * Moved a state variable to the routine it's used for. (Drive by refactoring)
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
  8. Move initialization of Git::SVN variables into Git::SVN.

    schwern committed with Eric Wong Jul 26, 2012
    Also it can compile on its own now, yay!
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
  9. Extract Git::SVN from git-svn into its own .pm file.

    schwern committed with Eric Wong Jul 26, 2012
    Except for adding the 1; at the end, this is a straight copy & paste.
    
    Tests still pass, but its doubtful Git::SVN will compile on its own
    without git-svn being loaded.  Next commit will fix that.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: Eric Wong <normalperson@yhbt.net>