1. 19 3月, 2014 17 次提交
    • J
      Merge branch 'rm/strchrnul-not-strlen' · 6f75e483
      Junio C Hamano 提交于
      * rm/strchrnul-not-strlen:
        use strchrnul() in place of strchr() and strlen()
      6f75e483
    • J
      Merge branch 'jc/tag-contains-with' · 884377c1
      Junio C Hamano 提交于
      * jc/tag-contains-with:
        tag: grok "--with" as synonym to "--contains"
      884377c1
    • 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 23 次提交