1. 19 3月, 2014 15 次提交
    • J
      Merge branch 'bg/install-branch-config-skip-prefix' · 9cf0137b
      Junio C Hamano 提交于
      * bg/install-branch-config-skip-prefix:
        branch: use skip_prefix() in install_branch_config()
        t3200-branch: test setting branch as own upstream
      9cf0137b
    • J
      Merge branch 'jc/no-need-for-env-in-sh-scripts' · 1c18a14b
      Junio C Hamano 提交于
      * jc/no-need-for-env-in-sh-scripts:
        *.sh: drop useless use of "env"
      1c18a14b
    • J
      Merge branch 'sh/use-hashcpy' · 006f6787
      Junio C Hamano 提交于
      * sh/use-hashcpy:
        Use hashcpy() when copying object names
      006f6787
    • J
      Merge branch 'mh/simplify-cache-tree-find' · da2e0579
      Junio C Hamano 提交于
      * mh/simplify-cache-tree-find:
        cache_tree_find(): use path variable when passing over slashes
        cache_tree_find(): remove early return
        cache_tree_find(): remove redundant check
        cache_tree_find(): fix comment formatting
        cache_tree_find(): find the end of path component using strchrnul()
        cache_tree_find(): remove redundant checks
      da2e0579
    • J
      Merge branch 'jn/branch-lift-unnecessary-name-length-limit' · 6bd34241
      Junio C Hamano 提交于
      * jn/branch-lift-unnecessary-name-length-limit:
        branch.c: delete size check of newly tracked branch names
      6bd34241
    • J
      Merge branch 'jk/doc-deprecate-grafts' · c0cca589
      Junio C Hamano 提交于
      * jk/doc-deprecate-grafts:
        docs: mark info/grafts as outdated
      c0cca589
    • J
      Merge branch 'jk/detect-push-typo-early' · 9befb340
      Junio C Hamano 提交于
      Catch "git push $there no-such-branch" early.
      
      * jk/detect-push-typo-early:
        push: detect local refspec errors early
        match_explicit_lhs: allow a "verify only" mode
        match_explicit: hoist refspec lhs checks into their own function
      9befb340
    • J
      Merge branch 'jk/repack-pack-keep-objects' · 249d54b2
      Junio C Hamano 提交于
      * jk/repack-pack-keep-objects:
        repack: add `repack.packKeptObjects` config var
      249d54b2
    • J
      Merge branch 'sh/finish-tmp-packfile' · f4eec8ce
      Junio C Hamano 提交于
      * sh/finish-tmp-packfile:
        finish_tmp_packfile():use strbuf for pathname construction
      f4eec8ce
    • J
      Merge branch 'dd/use-alloc-grow' · fe9122a3
      Junio C Hamano 提交于
      Replace open-coded reallocation with ALLOC_GROW() macro.
      
      * dd/use-alloc-grow:
        sha1_file.c: use ALLOC_GROW() in pretend_sha1_file()
        read-cache.c: use ALLOC_GROW() in add_index_entry()
        builtin/mktree.c: use ALLOC_GROW() in append_to_tree()
        attr.c: use ALLOC_GROW() in handle_attr_line()
        dir.c: use ALLOC_GROW() in create_simplify()
        reflog-walk.c: use ALLOC_GROW()
        replace_object.c: use ALLOC_GROW() in register_replace_object()
        patch-ids.c: use ALLOC_GROW() in add_commit()
        diffcore-rename.c: use ALLOC_GROW()
        diff.c: use ALLOC_GROW()
        commit.c: use ALLOC_GROW() in register_commit_graft()
        cache-tree.c: use ALLOC_GROW() in find_subtree()
        bundle.c: use ALLOC_GROW() in add_to_ref_list()
        builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path()
      fe9122a3
    • J
      Merge branch 'dd/find-graft-with-sha1-pos' · a8e1d711
      Junio C Hamano 提交于
      Replace a hand-rolled binary search with a call to our generic
      binary search helper function.
      
      * dd/find-graft-with-sha1-pos:
        commit.c: use the generic "sha1_pos" function for lookup
      a8e1d711
    • J
      Merge branch 'fc/transport-helper-fixes' · 90e6255a
      Junio C Hamano 提交于
      Updates transport-helper, fast-import and fast-export to allow the
      ref mapping and ref deletion in a way similar to the natively
      supported transports.
      
      * fc/transport-helper-fixes:
        remote-bzr: support the new 'force' option
        test-hg.sh: tests are now expected to pass
        transport-helper.c: do not overwrite forced bit
        transport-helper: check for 'forced update' message
        transport-helper: add 'force' to 'export' helpers
        transport-helper: don't update refs in dry-run
        transport-helper: mismerge fix
      90e6255a
    • J
      Merge branch 'nd/sha1-file-delta-stack-leakage-fix' · decba94d
      Junio C Hamano 提交于
      Fix a small leak in the delta stack used when resolving a long
      delta chain at runtime.
      
      * nd/sha1-file-delta-stack-leakage-fix:
        sha1_file: fix delta_stack memory leak in unpack_entry
      decba94d
    • J
      Merge branch 'jk/diff-filespec-cleanup' · 9b347673
      Junio C Hamano 提交于
      Portability fix to a topic already in v1.9
      
      * jk/diff-filespec-cleanup:
        diffcore.h: be explicit about the signedness of is_binary
      9b347673
    • J
      Merge branch 'jk/clean-d-pathspec' · 15520a85
      Junio C Hamano 提交于
      "git clean -d pathspec" did not use the given pathspec correctly
      and ended up cleaning too much.
      
      * jk/clean-d-pathspec:
        clean: simplify dir/not-dir logic
        clean: respect pathspecs with "-d"
      15520a85
  2. 15 3月, 2014 25 次提交
    • J
      Update draft release notes to Git 2.0 · 00eda232
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      00eda232
    • J
      Merge branch 'ta/parse-commit-with-skip-prefix' · 27ac2b1f
      Junio C Hamano 提交于
      * ta/parse-commit-with-skip-prefix:
        commit.c: use skip_prefix() instead of starts_with()
      27ac2b1f
    • J
      Merge branch 'sr/add--interactive-term-readkey' · e8cb4996
      Junio C Hamano 提交于
      * sr/add--interactive-term-readkey:
        git-add--interactive: warn if module for interactive.singlekey is missing
        git-config: document interactive.singlekey requires Term::ReadKey
      e8cb4996
    • J
      Merge branch 'sh/write-pack-file-warning-message-fix' · 56e2874a
      Junio C Hamano 提交于
      A warning from "git pack-objects" were generated by referring to an
      incorrect variable when forming the filename that we had trouble
      with.
      
      * sh/write-pack-file-warning-message-fix:
        write_pack_file: use correct variable in diagnostic
      56e2874a
    • J
      Merge branch 'nd/strbuf-inline-styles' · 27c2c2ec
      Junio C Hamano 提交于
      * nd/strbuf-inline-styles:
        strbuf: style fix -- top opening bracket on a separate line
      27c2c2ec
    • J
      Merge branch 'jn/bisect-coding-style' · 117a355c
      Junio C Hamano 提交于
      * jn/bisect-coding-style:
        git-bisect.sh: fix a few style issues
      117a355c
    • J
      Merge branch 'mh/replace-refs-variable-rename' · 3e30cb0f
      Junio C Hamano 提交于
      * mh/replace-refs-variable-rename:
        Document some functions defined in object.c
        Add docstrings for lookup_replace_object() and do_lookup_replace_object()
        rename read_replace_refs to check_replace_refs
      3e30cb0f
    • J
      Merge branch 'sg/archive-restrict-remote' · d552f8df
      Junio C Hamano 提交于
      Allow loosening remote "git archive" invocation security check that
      refuses to serve tree-ish not at the tip of any ref.
      
      * sg/archive-restrict-remote:
        add uploadarchive.allowUnreachable option
        docs: clarify remote restrictions for git-upload-archive
      d552f8df
    • J
      Merge branch 'rt/help-pretty-prints-cmd-names' · c89eb987
      Junio C Hamano 提交于
      * rt/help-pretty-prints-cmd-names:
        help.c: rename function "pretty_print_string_list"
      c89eb987
    • J
      Merge branch 'jl/doc-submodule-update-checkout' · d73e6160
      Junio C Hamano 提交于
      Add missing documentation for "submodule update --checkout".
      
      * jl/doc-submodule-update-checkout:
        submodule update: consistently document the '--checkout' option
      d73e6160
    • J
      Merge branch 'jk/doc-coding-guideline' · 2b66d315
      Junio C Hamano 提交于
      Elaborate on a style niggle that has been part of "mimic existing
      code".
      
      * jk/doc-coding-guideline:
        CodingGuidelines: mention C whitespace rules
      2b66d315
    • J
      Merge branch 'da/difftool-git-files' · 26696382
      Junio C Hamano 提交于
      "git difftool" misbehaved when the repository is bound to the
      working tree with the ".git file" mechanism, where a textual
      file ".git" tells us where it is.
      
      * da/difftool-git-files:
        t7800: add a difftool test for .git-files
        difftool: support repositories with .git-files
      26696382
    • J
      Merge branch 'tg/index-v4-format' · 13b49f1e
      Junio C Hamano 提交于
      * tg/index-v4-format:
        read-cache: add index.version config variable
        test-lib: allow setting the index format version
        introduce GIT_INDEX_VERSION environment variable
      13b49f1e
    • J
      Merge branch 'nd/i18n-progress' · 0963008c
      Junio C Hamano 提交于
      Mark the progress indicators from various time-consuming commands
      for i18n/l10n.
      
      * nd/i18n-progress:
        i18n: mark all progress lines for translation
      0963008c
    • J
      Merge branch 'mh/object-code-cleanup' · 060be006
      Junio C Hamano 提交于
      * mh/object-code-cleanup:
        sha1_file.c: document a bunch of functions defined in the file
        sha1_file_name(): declare to return a const string
        find_pack_entry(): document last_found_pack
        replace_object: use struct members instead of an array
      060be006
    • J
      Merge branch 'jn/am-doc-hooks' · 85ff22e6
      Junio C Hamano 提交于
      * jn/am-doc-hooks:
        am doc: add a pointer to relevant hooks
      85ff22e6
    • J
      Merge branch 'jm/stash-doc-k-for-keep' · 430e4761
      Junio C Hamano 提交于
      * jm/stash-doc-k-for-keep:
        stash doc: mention short form -k in save description
      430e4761
    • J
      Merge branch 'jk/remote-pushremote-config-reading' · d52571d5
      Junio C Hamano 提交于
      "git push" did not pay attention to branch.*.pushremote if it is
      defined earlier than remote.pushdefault; the order of these two
      variables in the configuration file should not matter, but it did by
      mistake.
      
      * jk/remote-pushremote-config-reading:
        remote: handle pushremote config in any order
      d52571d5
    • J
      Merge branch 'jk/commit-dates-parsing-fix' · 3c83b080
      Junio C Hamano 提交于
      Tighten codepaths that parse timestamps in commit objects.
      
      * jk/commit-dates-parsing-fix:
        show_ident_date: fix tz range check
        log: do not segfault on gmtime errors
        log: handle integer overflow in timestamps
        date: check date overflow against time_t
        fsck: report integer overflow in author timestamps
        t4212: test bogus timestamps with git-log
      3c83b080
    • J
      Merge branch 'jh/note-trees-record-blobs' · b37f81b7
      Junio C Hamano 提交于
      "git notes -C <blob>" should not take an object that is not a blob.
      
      * jh/note-trees-record-blobs:
        notes: disallow reusing non-blob as a note object
      b37f81b7
    • J
      Merge branch 'rt/links-for-asciidoctor' · c923f603
      Junio C Hamano 提交于
      * rt/links-for-asciidoctor:
        Documentation: fix documentation AsciiDoc links for external urls
      c923f603
    • J
      Merge branch 'nd/no-more-fnmatch' · 650c90a1
      Junio C Hamano 提交于
      We started using wildmatch() in place of fnmatch(3); complete the
      process and stop using fnmatch(3).
      
      * nd/no-more-fnmatch:
        actually remove compat fnmatch source code
        stop using fnmatch (either native or compat)
        Revert "test-wildmatch: add "perf" command to compare wildmatch and fnmatch"
        use wildmatch() directly without fnmatch() wrapper
      650c90a1
    • J
      Merge branch 'ak/gitweb-fit-image' · 3a66e1bf
      Junio C Hamano 提交于
      Instead of allowing an <img> to be shown in whatever size, force
      scaling it to fit on the page with max-height/max-width css style
      attributes.
      
      * ak/gitweb-fit-image:
        gitweb: Avoid overflowing page body frame with large images
      3a66e1bf
    • J
      Merge branch 'tr/diff-submodule-no-reuse-worktree' · 481e6aaa
      Junio C Hamano 提交于
      "git diff --external-diff" incorrectly fed the submodule directory
      in the working tree to the external diff driver when it knew it is
      the same as one of the versions being compared.
      
      * tr/diff-submodule-no-reuse-worktree:
        diff: do not reuse_worktree_file for submodules
      481e6aaa
    • J
      Merge branch 'nd/reset-setup-worktree' · 6eb593a7
      Junio C Hamano 提交于
      "git reset" needs to refresh the index when working in a working
      tree (it can also be used to match the index to the HEAD in an
      otherwise bare repository), but it failed to set up the working
      tree properly, causing GIT_WORK_TREE to be ignored.
      
      * nd/reset-setup-worktree:
        reset: optionally setup worktree and refresh index on --mixed
      6eb593a7