1. 23 12月, 2014 30 次提交
    • J
      Merge branch 'js/fsck-tag-validation' · 1cb4b3d3
      Junio C Hamano 提交于
      New tag object format validation added in 2.2 showed garbage
      after a tagname it reported in its error message.
      
      * js/fsck-tag-validation:
        index-pack: terminate object buffers with NUL
        fsck: properly bound "invalid tag name" error message
      1cb4b3d3
    • J
      Merge branch 'po/doc-assume-unchanged' · 14d4aab3
      Junio C Hamano 提交于
      Fixes long-standing misunderstanding of what assume-unchanged is
      about.  Some text near what is removed by the bottom patch may also
      have to be removed.
      
      * po/doc-assume-unchanged:
        gitignore.txt: do not suggest assume-unchanged
        doc: make clear --assume-unchanged's user contract
      14d4aab3
    • J
      Merge branch 'mg/branch-d-m-f' · 15a171f6
      Junio C Hamano 提交于
      "git branch -d" (delete) and "git branch -m" (move) learned to
      honor "-f" (force) flag; unlike many other subcommands, the way to
      force these have been with separate "-D/-M" options, which was
      inconsistent.
      
      * mg/branch-d-m-f:
        branch: allow -f with -m and -d
        t3200-branch: test -M
      15a171f6
    • J
      Merge branch 'tb/t0027-eol-conversion' · 00c194a8
      Junio C Hamano 提交于
      * tb/t0027-eol-conversion:
        t0027: check the eol conversion warnings
      00c194a8
    • J
      Merge branch 'jk/for-each-reflog-ent-reverse' · 6f3abb7a
      Junio C Hamano 提交于
      The code that reads the reflog from the newer to the older entries
      did not handle an entry that crosses a boundary of block it uses to
      read them correctly.
      
      * jk/for-each-reflog-ent-reverse:
        for_each_reflog_ent_reverse: turn leftover check into assertion
        for_each_reflog_ent_reverse: fix newlines on block boundaries
      6f3abb7a
    • J
      Merge branch 'sb/string-list' · 12b9f089
      Junio C Hamano 提交于
      API simplification.
      
      * sb/string-list:
        string_list: remove string_list_insert_at_index() from its API
        mailmap: use higher level string list functions
        string_list: document string_list_(insert,lookup)
      12b9f089
    • J
      Merge branch 'sv/doc-stripspace' · 53c3692e
      Junio C Hamano 提交于
      * sv/doc-stripspace:
        Documentation/git-stripspace: add synopsis for --comment-lines
      53c3692e
    • J
      Merge branch 'rt/completion-tag' · 2cd20dc3
      Junio C Hamano 提交于
      * rt/completion-tag:
        completion: add git-tag options
      2cd20dc3
    • J
      Merge branch 'mg/doc-check-ignore-tracked-are-not-ignored' · 3ab00292
      Junio C Hamano 提交于
      * mg/doc-check-ignore-tracked-are-not-ignored:
        check-ignore: clarify treatment of tracked files
      3ab00292
    • J
      Merge branch 'jk/credential-quit' · 86362f72
      Junio C Hamano 提交于
      Credential helpers are asked in turn until one of them give
      positive response, which is cumbersome to turn off when you need to
      run Git in an automated setting.  The credential helper interface
      learned to allow a helper to say "stop, don't ask other helpers."
      Also GIT_TERMINAL_PROMPT environment can be set to false to disable
      our built-in prompt mechanism for passwords.
      
      * jk/credential-quit:
        prompt: respect GIT_TERMINAL_PROMPT to disable terminal prompts
        credential: let helpers tell us to quit
      86362f72
    • J
      Merge branch 'dm/compat-s-ifmt-for-zos' · 2f17ecbd
      Junio C Hamano 提交于
      Long overdue departure from the assumption that S_IFMT is shared by
      everybody made in 2005.
      
      * dm/compat-s-ifmt-for-zos:
        compat: convert modes to use portable file type values
      2f17ecbd
    • J
      Merge branch 'ps/new-workdir-into-empty-directory' · 0b5ae7ba
      Junio C Hamano 提交于
      "git new-workdir" (in contrib/) can be used to populate an empty
      and existing directory now.
      
      * ps/new-workdir-into-empty-directory:
        git-new-workdir: don't fail if the target directory is empty
      0b5ae7ba
    • J
      Merge branch 'nd/ls-tree-pathspec' · 57007723
      Junio C Hamano 提交于
      "git ls-tree" does not support path selection based on negative
      pathspecs, but did not error out when negative pathspecs are given.
      
      * nd/ls-tree-pathspec:
        t3102: style modernization
        t3102: document that ls-tree does not yet support negated pathspec
        ls-tree: disable negative pathspec because it's not supported
        ls-tree: remove path filtering logic in show_tree
        tree.c: update read_tree_recursive callback to pass strbuf as base
      57007723
    • J
      Merge branch 'jc/hook-cleanup' · 77a801d2
      Junio C Hamano 提交于
      Remove unused code.
      
      * jc/hook-cleanup:
        run-command.c: retire unused run_hook_with_custom_index()
      77a801d2
    • J
      Merge branch 'rt/for-each-ref-spell-tcl-as-Tcl' · a558344c
      Junio C Hamano 提交于
      * rt/for-each-ref-spell-tcl-as-Tcl:
        for-each-ref: correct spelling of Tcl in option description
      a558344c
    • J
      Merge branch 'rj/t0050-passes' · 08884f57
      Junio C Hamano 提交于
      * rj/t0050-passes:
        t0050-*.sh: mark the rename (case change) test as passing
      08884f57
    • J
      Merge branch 'js/push-to-deploy' · 72ecc6ef
      Junio C Hamano 提交于
      "git push" into a repository with a working tree normally refuses
      to modify the branch that is checked out.  The command learned to
      optionally do an equivalent of "git reset --hard" only when there
      is no change to the working tree and the index instead, which would
      be useful to "deploy" by pushing into a repository.
      
      * js/push-to-deploy:
        t5516: more tests for receive.denyCurrentBranch=updateInstead
        receive-pack: add another option for receive.denyCurrentBranch
      72ecc6ef
    • J
      Merge branch 'jc/exec-cmd-system-path-leak-fix' · 6bcaff1a
      Junio C Hamano 提交于
      The function sometimes returned a non-freeable memory and some
      other times returned a piece of memory that must be freed.
      
      * jc/exec-cmd-system-path-leak-fix:
        system_path(): always return free'able memory to the caller
      6bcaff1a
    • J
      Merge branch 'mh/find-uniq-abbrev' · 5109f2aa
      Junio C Hamano 提交于
      The code to abbreviate an object name to its short unique prefix
      has been optimized when no abbreviation was requested.
      
      * mh/find-uniq-abbrev:
        sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrev
      5109f2aa
    • J
      Merge branch 'pb/send-email-te' · 2374f1df
      Junio C Hamano 提交于
      "git send-email" learned "--transfer-encoding" option to force
      a non-fault Content-Transfer-Encoding header (e.g. base64).
      
      * pb/send-email-te:
        git-send-email: add --transfer-encoding option
        git-send-email: delay creation of MIME headers
      2374f1df
    • J
      Merge branch 'pb/am-message-id-footer' · fa7f51d5
      Junio C Hamano 提交于
      "git am" learned "--message-id" option to copy the message ID of
      the incoming e-mail to the log message of resulting commit.
      
      * pb/am-message-id-footer:
        git-am: add --message-id/--no-message-id
        git-mailinfo: add --message-id
      fa7f51d5
    • J
      Merge branch 'mh/simplify-repack-without-refs' · a7ddaa8e
      Junio C Hamano 提交于
      "git remote update --prune" to drop many refs has been optimized.
      
      * mh/simplify-repack-without-refs:
        sort_string_list(): rename to string_list_sort()
        prune_remote(): iterate using for_each_string_list_item()
        prune_remote(): rename local variable
        repack_without_refs(): make the refnames argument a string_list
        prune_remote(): sort delete_refs_list references en masse
        prune_remote(): initialize both delete_refs lists in a single loop
        prune_remote(): exit early if there are no stale references
      a7ddaa8e
    • J
      Merge branch 'dw/shell-basename-dashdash-before-stripping-leading-dash-from-login' · 8e606f97
      Junio C Hamano 提交于
      * dw/shell-basename-dashdash-before-stripping-leading-dash-from-login:
        git-sh-setup.sh: use dashdash with basename call
      8e606f97
    • J
      Merge branch 'rj/no-xopen-source-for-cygwin' · 7665d9c3
      Junio C Hamano 提交于
      Avoid compilation warnings on recent gcc toolchain on Cygwin.
      
      * rj/no-xopen-source-for-cygwin:
        git-compat-util.h: don't define _XOPEN_SOURCE on cygwin
      7665d9c3
    • J
      Merge branch 'js/t5000-dont-copy-bin-sh' · 4762c7b4
      Junio C Hamano 提交于
      * js/t5000-dont-copy-bin-sh:
        t5000 on Windows: do not mistake "sh.exe" as "sh"
      4762c7b4
    • J
      Merge branch 'jc/refer-to-t-readme-from-submitting-patches' · 63296d58
      Junio C Hamano 提交于
      * jc/refer-to-t-readme-from-submitting-patches:
        t/README: justify why "! grep foo" is sufficient
        SubmittingPatches: refer to t/README for tests
      63296d58
    • J
      Merge branch 'tb/config-core-filemode-check-on-broken-fs' · 168ab99d
      Junio C Hamano 提交于
      Some filesystems assign filemodes in a strange way, fooling then
      automatic "filemode trustability" check done during a new
      repository creation.
      
      * tb/config-core-filemode-check-on-broken-fs:
        init-db: improve the filemode trustability check
      168ab99d
    • J
      Merge branch 'mg/add-ignore-errors' · 01782070
      Junio C Hamano 提交于
      "git add --ignore-errors ..." did not ignore an error to
      give a file that did not exist.
      
      * mg/add-ignore-errors:
        add: ignore only ignored files
      01782070
    • J
      Merge branch 'jk/lock-ref-sha1-basic-return-errors' · 3cdb0cb6
      Junio C Hamano 提交于
      Correct an API anomaly.
      
      * jk/lock-ref-sha1-basic-return-errors:
        lock_ref_sha1_basic: do not die on locking errors
      3cdb0cb6
    • J
      Merge branch 'cc/interpret-trailers-more' · 0ed8a4e1
      Junio C Hamano 提交于
      "git interpret-trailers" learned to properly handle the
      "Conflicts:" block at the end.
      
      * cc/interpret-trailers-more:
        trailer: add test with an old style conflict block
        trailer: reuse ignore_non_trailer() to ignore conflict lines
        commit: make ignore_non_trailer() non static
        merge & sequencer: turn "Conflicts:" hint into a comment
        builtin/commit.c: extract ignore_non_trailer() helper function
        merge & sequencer: unify codepaths that write "Conflicts:" hint
        builtin/merge.c: drop a parameter that is never used
      0ed8a4e1
  2. 19 12月, 2014 1 次提交
    • J
      Sync with v2.2.1 · 3f150980
      Junio C Hamano 提交于
      * maint:
        Git 2.2.1
        Git 2.1.4
        Git 2.0.5
        Git 1.9.5
        Git 1.8.5.6
        fsck: complain about NTFS ".git" aliases in trees
        read-cache: optionally disallow NTFS .git variants
        path: add is_ntfs_dotgit() helper
        fsck: complain about HFS+ ".git" aliases in trees
        read-cache: optionally disallow HFS+ .git variants
        utf8: add is_hfs_dotgit() helper
        fsck: notice .git case-insensitively
        t1450: refactor ".", "..", and ".git" fsck tests
        verify_dotfile(): reject .git case-insensitively
        read-tree: add tests for confusing paths like ".." and ".git"
        unpack-trees: propagate errors adding entries to the index
      3f150980
  3. 18 12月, 2014 9 次提交
    • J
      Git 2.2.1 · 9b7cbb31
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      9b7cbb31
    • J
      Sync with v2.1.4 · 77933f44
      Junio C Hamano 提交于
      * maint-2.1:
        Git 2.1.4
        Git 2.0.5
        Git 1.9.5
        Git 1.8.5.6
        fsck: complain about NTFS ".git" aliases in trees
        read-cache: optionally disallow NTFS .git variants
        path: add is_ntfs_dotgit() helper
        fsck: complain about HFS+ ".git" aliases in trees
        read-cache: optionally disallow HFS+ .git variants
        utf8: add is_hfs_dotgit() helper
        fsck: notice .git case-insensitively
        t1450: refactor ".", "..", and ".git" fsck tests
        verify_dotfile(): reject .git case-insensitively
        read-tree: add tests for confusing paths like ".." and ".git"
        unpack-trees: propagate errors adding entries to the index
      77933f44
    • J
      Git 2.1.4 · 8e36a6d5
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      8e36a6d5
    • J
      Sync with v2.0.5 · 58f1d950
      Junio C Hamano 提交于
      * maint-2.0:
        Git 2.0.5
        Git 1.9.5
        Git 1.8.5.6
        fsck: complain about NTFS ".git" aliases in trees
        read-cache: optionally disallow NTFS .git variants
        path: add is_ntfs_dotgit() helper
        fsck: complain about HFS+ ".git" aliases in trees
        read-cache: optionally disallow HFS+ .git variants
        utf8: add is_hfs_dotgit() helper
        fsck: notice .git case-insensitively
        t1450: refactor ".", "..", and ".git" fsck tests
        verify_dotfile(): reject .git case-insensitively
        read-tree: add tests for confusing paths like ".." and ".git"
        unpack-trees: propagate errors adding entries to the index
      58f1d950
    • J
      Git 2.0.5 · 9a8c2b67
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      9a8c2b67
    • J
      Sync with v1.9.5 · 5e519fb8
      Junio C Hamano 提交于
      * maint-1.9:
        Git 1.9.5
        Git 1.8.5.6
        fsck: complain about NTFS ".git" aliases in trees
        read-cache: optionally disallow NTFS .git variants
        path: add is_ntfs_dotgit() helper
        fsck: complain about HFS+ ".git" aliases in trees
        read-cache: optionally disallow HFS+ .git variants
        utf8: add is_hfs_dotgit() helper
        fsck: notice .git case-insensitively
        t1450: refactor ".", "..", and ".git" fsck tests
        verify_dotfile(): reject .git case-insensitively
        read-tree: add tests for confusing paths like ".." and ".git"
        unpack-trees: propagate errors adding entries to the index
      5e519fb8
    • J
      Git 1.9.5 · 83332636
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      83332636
    • J
      Sync with v1.8.5.6 · 6898b797
      Junio C Hamano 提交于
      * maint-1.8.5:
        Git 1.8.5.6
        fsck: complain about NTFS ".git" aliases in trees
        read-cache: optionally disallow NTFS .git variants
        path: add is_ntfs_dotgit() helper
        fsck: complain about HFS+ ".git" aliases in trees
        read-cache: optionally disallow HFS+ .git variants
        utf8: add is_hfs_dotgit() helper
        fsck: notice .git case-insensitively
        t1450: refactor ".", "..", and ".git" fsck tests
        verify_dotfile(): reject .git case-insensitively
        read-tree: add tests for confusing paths like ".." and ".git"
        unpack-trees: propagate errors adding entries to the index
      6898b797
    • J
      Git 1.8.5.6 · 5c8213a7
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      5c8213a7