Skip to content

G
git

李少辉-开发者 / git
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

体验新版 GitCode，发现更多精彩内容 >>

切换分支/标签
  1. 21 3月, 2016 1 次提交
  3. 20 3月, 2016 1 次提交
  5. 18 3月, 2016 2 次提交
  7. 17 3月, 2016 3 次提交
  9. 16 3月, 2016 8 次提交
  11. 15 3月, 2016 3 次提交
  13. 13 3月, 2016 3 次提交
  15. 12 3月, 2016 3 次提交
  17. 11 3月, 2016 16 次提交
    • J
      Git 2.8-rc2 · ed9067f7
      由 Junio C Hamano 提交于 
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      ed9067f7
    • J
      Sync with 2.7.3 · 5d1847b7
      由 Junio C Hamano 提交于
      5d1847b7
    • J
      Git 2.7.3 · 594730e9
      由 Junio C Hamano 提交于 
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      594730e9
    • J
      Merge branch 'ma/update-hooks-sample-typofix' into maint · 2e1e569d
      由 Junio C Hamano 提交于 
      * ma/update-hooks-sample-typofix:
  templates/hooks: fix minor typo in the sample update-hook
      2e1e569d
    • J
      Merge branch 'dt/initial-ref-xn-commit-doc' into maint · 3e6e43e1
      由 Junio C Hamano 提交于 
      * dt/initial-ref-xn-commit-doc:
  refs: document transaction semantics
      3e6e43e1
    • J
      Merge branch 'ps/plug-xdl-merge-leak' into maint · 4da40269
      由 Junio C Hamano 提交于 
      * ps/plug-xdl-merge-leak:
  xdiff/xmerge: fix memory leak in xdl_merge
      4da40269
    • J
      Merge branch 'ak/git-strip-extension-from-dashed-command' into maint · 08e21c9b
      由 Junio C Hamano 提交于 
      Code simplification.

* ak/git-strip-extension-from-dashed-command:
  git.c: simplify stripping extension of a file in handle_builtin()
      08e21c9b
    • J
      Merge branch 'ak/extract-argv0-last-dir-sep' into maint · c6f399c9
      由 Junio C Hamano 提交于 
      Code simplification.

* ak/extract-argv0-last-dir-sep:
  exec_cmd.c: use find_last_dir_sep() for code simplification
      c6f399c9
    • J
      Merge branch 'jk/pack-idx-corruption-safety' into maint · 80047fa0
      由 Junio C Hamano 提交于 
      The code to read the pack data using the offsets stored in the pack
idx file has been made more carefully check the validity of the
data in the idx.

* jk/pack-idx-corruption-safety:
  sha1_file.c: mark strings for translation
  use_pack: handle signed off_t overflow
  nth_packed_object_offset: bounds-check extended offset
  t5313: test bounds-checks of corrupted/malicious pack/idx files
      80047fa0
    • J
      Merge branch 'js/config-set-in-non-repository' into maint · 0e58b47d
      由 Junio C Hamano 提交于 
      "git config section.var value" to set a value in per-repository
configuration file failed when it was run outside any repository,
but didn't say the reason correctly.

* js/config-set-in-non-repository:
  git config: report when trying to modify a non-existing repo config
      0e58b47d
    • J
      Merge branch 'sb/submodule-module-list-fix' into maint · 1191d606
      由 Junio C Hamano 提交于 
      A helper function "git submodule" uses since v2.7.0 to list the
modules that match the pathspec argument given to its subcommands
(e.g. "submodule add <repo> <path>") has been fixed.

* sb/submodule-module-list-fix:
  submodule helper list: respect correct path prefix
      1191d606
    • J
      Merge branch 'jk/grep-binary-workaround-in-test' into maint · 7f18fadc
      由 Junio C Hamano 提交于 
      Recent versions of GNU grep are pickier when their input contains
arbitrary binary data, which some of our tests uses.  Rewrite the
tests to sidestep the problem.

* jk/grep-binary-workaround-in-test:
  t9200: avoid grep on non-ASCII data
  t8005: avoid grep on non-ASCII data
      7f18fadc
    • J
      Merge branch 'mm/push-simple-doc' into maint · d4e7b9bc
      由 Junio C Hamano 提交于 
      The documentation did not clearly state that the 'simple' mode is
now the default for "git push" when push.default configuration is
not set.

* mm/push-simple-doc:
  Documentation/git-push: document that 'simple' is the default
      d4e7b9bc
    • J
      Merge branch 'jk/tighten-alloc' into maint · b7a6ec60
      由 Junio C Hamano 提交于 
      * jk/tighten-alloc: (23 commits)
  compat/mingw: brown paper bag fix for 50a6c8ef
  ewah: convert to REALLOC_ARRAY, etc
  convert ewah/bitmap code to use xmalloc
  diff_populate_gitlink: use a strbuf
  transport_anonymize_url: use xstrfmt
  git-compat-util: drop mempcpy compat code
  sequencer: simplify memory allocation of get_message
  test-path-utils: fix normalize_path_copy output buffer size
  fetch-pack: simplify add_sought_entry
  fast-import: simplify allocation in start_packfile
  write_untracked_extension: use FLEX_ALLOC helper
  prepare_{git,shell}_cmd: use argv_array
  use st_add and st_mult for allocation size computation
  convert trivial cases to FLEX_ARRAY macros
  use xmallocz to avoid size arithmetic
  convert trivial cases to ALLOC_ARRAY
  convert manual allocations to argv_array
  argv-array: add detach function
  add helpers for allocating flex-array structs
  harden REALLOC_ARRAY and xcalloc against size_t overflow
  ...
      b7a6ec60
    • J
      Merge branch 'jk/more-comments-on-textconv' into maint · aa6c22ec
      由 Junio C Hamano 提交于 
      The memory ownership rule of fill_textconv() API, which was a bit
tricky, has been documented a bit better.

* jk/more-comments-on-textconv:
  diff: clarify textconv interface
      aa6c22ec
    • J
      Merge branch 'jk/no-diff-emit-common' into maint · 6044329c
      由 Junio C Hamano 提交于 
      "git merge-tree" used to mishandle "both sides added" conflict with
its own "create a fake ancestor file that has the common parts of
what both sides have added and do a 3-way merge" logic; this has
been updated to use the usual "3-way merge with an empty blob as
the fake common ancestor file" approach used in the rest of the
system.

* jk/no-diff-emit-common:
  xdiff: drop XDL_EMIT_COMMON
  merge-tree: drop generate_common strategy
  merge-one-file: use empty blob for add/add base
      6044329c