Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jun 12, 2013
  1. @ojab @gitster

    Fix `git svn` `rebase` & `dcommit` if top-level HEAD directory exist

    ojab authored gitster committed
    When a file (or a directory) called HEAD exists in the working tree,
    internal calls git svn makes trigger "did you mean a revision or a
    path?" ambiguity check.
    
        $ git svn rebase
        fatal: ambiguous argument 'HEAD': both revision and filename
        Use '--' to separate paths from revisions, like this:
        'git <command> [<revision>...] -- [<file>...]'
        rev-list --first-parent --pretty=medium HEAD: command returned error: 128
    
    Explicitly disambiguate by adding "--" after the revision.
    
    Signed-off-by: Slava Kardakov <ojab@ojab.ru>
    Reviewed-by: Jeff King <peff@peff.net>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 11, 2013
  1. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      t0070 "mktemp to unwritable directory" needs SANITY
      pre-push.sample: Make the script executable
  2. @gitster

    Merge branch 'maint-1.8.2' into maint

    gitster authored
    * maint-1.8.2:
      t0070 "mktemp to unwritable directory" needs SANITY
      pre-push.sample: Make the script executable
  3. @tboegi @gitster

    t0070 "mktemp to unwritable directory" needs SANITY

    tboegi authored gitster committed
    Use the SANITY prerequisite when testing if a temp file can
    be created in a read only directory.
    Skip the test under CYGWIN, or skip it under Unix/Linux when
    it is run as root.
    
    Signed-off-by: Torsten Bögershausen <tboegi@web.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    Update draft release notes

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

    Merge branch 'cm/gitweb-project-list-persistent-cgi-fix'

    gitster authored
    "gitweb" forgot to clear a global variable $search_regexp upon each
    request, mistakenly carrying over the previous search to a new one
    when used as a persistent CGI.
    
    * cm/gitweb-project-list-persistent-cgi-fix:
      gitweb: fix problem causing erroneous project list
  6. @gitster

    Merge branch 'rr/maint-fetch-tag-doc-asterisks'

    gitster authored
    * rr/maint-fetch-tag-doc-asterisks:
      fetch-options.txt: prevent a wildcard refspec from getting misformatted
  7. @gitster

    Merge branch 'rr/rebase-autostash'

    gitster authored
    * rr/rebase-autostash:
      rebase: implement --[no-]autostash and rebase.autostash
      rebase --merge: return control to caller, for housekeeping
      rebase -i: return control to caller, for housekeeping
      am: return control to caller, for housekeeping
      rebase: prepare to do generic housekeeping
      rebase -i: don't error out if $state_dir already exists
      am: tighten a conditional that checks for $dotest
  8. @gitster

    Merge branch 'jk/test-exit-code-by-signal'

    gitster authored
    * jk/test-exit-code-by-signal:
      t0005: skip signal death exit code test on Windows
      t0005: test git exit code from signal death
  9. @gitster

    Merge branch 'fc/at-head'

    gitster authored
    Instead of typing four capital letters "HEAD", you can say "@"
    instead.
    
    * fc/at-head:
      sha1_name: compare variable with constant, not constant with variable
      Add new @ shortcut for HEAD
      sha1_name: refactor reinterpret()
      sha1_name: check @{-N} errors sooner
      sha1_name: reorganize get_sha1_basic()
      sha1_name: don't waste cycles in the @-parsing loop
      sha1_name: remove unnecessary braces
      sha1_name: remove no-op
      tests: at-combinations: @{N} versus HEAD@{N}
      tests: at-combinations: increase coverage
      tests: at-combinations: improve nonsense()
      tests: at-combinations: check ref names directly
      tests: at-combinations: simplify setup
  10. @gitster

    Merge branch 'ar/wildmatch-foldcase'

    gitster authored
    The wildmatch engine did not honor WM_CASEFOLD option correctly.
    
    * ar/wildmatch-foldcase:
      wildmatch: properly fold case everywhere
  11. @gitster

    Merge branch 'tr/sha1-file-silence-loose-object-info-under-prune-race'

    gitster authored
    * tr/sha1-file-silence-loose-object-info-under-prune-race:
      sha1_file: silence sha1_loose_object_info
  12. @gitster

    Merge branch 'nd/warn-ambiguous-object-name'

    gitster authored
    "git cmd <name>", when <name> happens to be a 40-hex string,
    directly uses the 40-hex string as an object name, even if a ref
    "refs/<some hierarchy>/<name>" exists.  This disambiguation order
    is unlikely to change, but we should warn about the ambiguity just
    like we warn when more than one refs/ hierachies share the same
    name.
    
    * nd/warn-ambiguous-object-name:
      get_sha1: warn about full or short object names that look like refs
  13. @gitster

    Merge branch 'rr/diffcore-pickaxe-doc'

    gitster authored
    Update the low-level diffcore documentation on -S/-G and --pickaxe-all.
    
    * rr/diffcore-pickaxe-doc:
      diffcore-pickaxe doc: document -S and -G properly
      diffcore-pickaxe: make error messages more consistent
  14. @gitster

    Merge branch 'cr/git-work-tree-sans-git-dir'

    gitster authored
    These days, "git --work-tree=there cmd" without specifying an
    explicit --git-dir=here will do the usual discovery, but we had a
    description of older behaviour in the documentation.
    
    * cr/git-work-tree-sans-git-dir:
      git.txt: remove stale comment regarding GIT_WORK_TREE
  15. @gitster

    Merge branch 'mm/mediawiki-https-fail-message'

    gitster authored
    Hint users when https:// connection failed to check the certificate.
    
    * mm/mediawiki-https-fail-message:
      git-remote-mediawiki: better error message when HTTP(S) access fails
  16. @gitster

    Merge branch 'cb/log-follow-with-combined'

    gitster authored
    * cb/log-follow-with-combined:
      fix segfault with git log -c --follow
  17. @gitster

    Merge branch 'xq/credential-osxkeychain'

    gitster authored
    * xq/credential-osxkeychain:
      credential-osxkeychain: support more protocols
  18. @gitster

    Merge branch 'fc/do-not-use-the-index-in-add-to-index'

    gitster authored
    * fc/do-not-use-the-index-in-add-to-index:
      read-cache: trivial style cleanups
      read-cache: fix wrong 'the_index' usage
  19. @gitster

    Merge branch 'fc/remote-bzr'

    gitster authored
    * fc/remote-bzr:
      remote-bzr: add fallback check for a partial clone
      remote-bzr: reorganize the way 'wanted' works
      remote-bzr: trivial cleanups
      remote-bzr: change global repo
      remote-bzr: delay cloning/pulling
      remote-bzr: simplify get_remote_branch()
      remote-bzr: fix for files with spaces
      remote-bzr: recover from failed clones
  20. @gitster

    Merge branch 'fc/remote-hg'

    gitster authored
    * fc/remote-hg: (50 commits)
      remote-hg: add support for --force
      remote-hg: add support for --dry-run
      remote-hg: check if a fetch is needed
      remote-hg: trivial cleanup
      remote-helpers: improve marks usage
      remote-hg: add check_push() helper
      remote-hg: add setup_big_push() helper
      remote-hg: remove files before modifications
      remote-hg: improve lightweight tag author
      remote-hg: use remote 'default' not local one
      remote-hg: improve branch listing
      remote-hg: simplify branch_tip()
      remote-hg: check diverged bookmarks
      remote-hg: pass around revision refs
      remote-hg: implement custom checkheads()
      remote-hg: implement custom push()
      remote-hg: only update necessary revisions
      remote-hg: force remote bookmark push selectively
      remote-hg: reorganize bookmark handling
      remote-hg: add test for failed double push
      ...
  21. @gitster

    Merge branch 'rj/mingw-cygwin'

    gitster authored
    Update build for Cygwin 1.[57].  Torsten Bögershausen reports that
    this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it
    ahead.
    
    * rj/mingw-cygwin:
      cygwin: Remove the CYGWIN_V15_WIN32API build variable
      mingw: rename WIN32 cpp macro to GIT_WINDOWS_NATIVE
  22. @gitster

    Merge branch 'fc/completion-less-ls-remote'

    gitster authored
    * fc/completion-less-ls-remote:
      completion: avoid ls-remote in certain scenarios
  23. @gitster

    Merge branch 'tr/test-commit-only-on-orphan'

    gitster authored
    * tr/test-commit-only-on-orphan:
      Test 'commit --only' after 'checkout --orphan'
  24. @gitster

    Merge branch 'rs/unpack-trees-plug-leak'

    gitster authored
    * rs/unpack-trees-plug-leak:
      unpack-trees: free cache_entry array members for merges
      diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const
      diff-lib, read-tree, unpack-trees: mark cache_entry pointers const
      unpack-trees: create working copy of merge entry in merged_entry
      unpack-trees: factor out dup_entry
      read-cache: mark cache_entry pointers const
      cache: mark cache_entry pointers const
  25. @gitster

    Merge branch 'rr/die-on-missing-upstream'

    gitster authored
    When a reflog notation is used for implicit "current branch", we
    did not say which branch and worse said "branch ''".
    
    * rr/die-on-missing-upstream:
      sha1_name: fix error message for @{<N>}, @{<date>}
      sha1_name: fix error message for @{u}
  26. @mineo @gitster

    pre-push.sample: Make the script executable

    mineo authored gitster committed
    githooks(5) says that "[...]the .sample files are executable by default"
    which was not true.
    
    Signed-off-by: Wieland Hoffmann <themineo@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 10, 2013
  1. @gitster

    Sync with 1.8.3.1

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

    Git 1.8.3.1

    gitster authored
    Primarily to push out two regression issues that seem to affect many
    people, namely, the ".gitignore !directory" bug and "daemon cannot
    read from $HOME owned by root" bug.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @kusma @gitster

    mingw: make mingw_signal return the correct handler

    kusma authored gitster committed
    Returning the SIGALRM handler for SIGINT is not very useful.
    
    Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    Merge branch 'jn/config-ignore-inaccessible' into maint

    gitster authored
    A git daemon that starts as "root" and then drops privilege often
    leaves $HOME set to that of the root user, which is unreadable by
    the daemon process, which was diagnosed as a configuration error.
    
    Make per-user configuration files that are inaccessible due to
    EACCES as though these files do not exist to avoid this issue, as
    the tightening which was originally meant as an additional security
    has annoyed enough sysadmins.
    
    * jn/config-ignore-inaccessible:
      config: allow inaccessible configuration under $HOME
  5. @gitster

    Merge branch 'kb/status-ignored-optim-2' into maint

    gitster authored
    Fix recent regression of .gitignore files that list !directory to
    mark it not-ignored.
    
    * kb/status-ignored-optim-2:
      dir.c: fix ignore processing within not-ignored directories
Commits on Jun 9, 2013
  1. @gitster

    submodule: remove redundant check for the_index.initialized

    René Scharfe authored gitster committed
    read_cache already performs the same check and returns immediately if
    the cache has already been loaded.
    
    Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @iveqy @gitster

    Document .git/modules

    iveqy authored gitster committed
    A note in the beginning of this document describes the behavior already.
    This patch just adds where to find the repositories.
    
    Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 7, 2013
  1. @chazmcgarvey @gitster

    gitweb: fix problem causing erroneous project list

    chazmcgarvey authored gitster committed
    The bug is manifest when running gitweb in a persistent process (e.g.
    FastCGI, PSGI), and it's easy to reproduce.  If a gitweb request
    includes the searchtext parameter (i.e. s), subsequent requests using
    the project_list action--which is the default action--and without
    a searchtext parameter will be filtered by the searchtext value of the
    first request.  This is because the value of the $search_regexp global
    (the value of which is based on the searchtext parameter) is currently
    being persisted between requests.
    
    Instead, clear $search_regexp before dispatching each request.
    
    Signed-off-by: Charles McGarvey <chazmcgarvey@brokenzipper.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.