1. 22 Jul, 2013 38 commits
    • Ondřej Bílka's avatar
      typofix: documentation · 17b83d71
      Ondřej Bílka authored
      Signed-off-by: default avatarOndřej Bílka <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      17b83d71
    • Ondřej Bílka's avatar
      typofix: release notes · 1114fc02
      Ondřej Bílka authored
      Signed-off-by: default avatarOndřej Bílka <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      1114fc02
    • Junio C Hamano's avatar
      Sync with Git 1.8.3.4 · 0bde8c0c
      Junio C Hamano authored
      0bde8c0c
    • Junio C Hamano's avatar
      Update draft release notes to 1.8.4 · 9c559d5b
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      9c559d5b
    • Junio C Hamano's avatar
      Merge branch 'jc/name-rev-exact-ref' · 3daafe94
      Junio C Hamano authored
      Corrects the longstanding sloppiness in the implementation of
      name-rev that conflated "we take commit-ish" and "differences
      between tags and commits do not matter".
      
      * jc/name-rev-exact-ref:
        describe: fix --contains when a tag is given as input
        name-rev: differentiate between tags and commits they point at
        describe: use argv-array
        name-rev: allow converting the exact object name at the tip of a ref
        name-ref: factor out name shortening logic from name_ref()
      3daafe94
    • Junio C Hamano's avatar
      Merge branch 'rr/send-email-ssl-verify' · 07b83b5d
      Junio C Hamano authored
      Newer Net::SMTP::SSL module does not want the user programs to use
      the default behaviour to let server certificate go without
      verification, so by default enable the verification with a
      mechanism to turn it off if needed.
      
      * rr/send-email-ssl-verify:
        send-email: be explicit with SSL certificate verification
      07b83b5d
    • Junio C Hamano's avatar
      Merge branch 'es/check-mailmap' · e683889b
      Junio C Hamano authored
      A new command to allow scripts to query the mailmap information.
      
      * es/check-mailmap:
        t4203: test check-mailmap command invocation
        builtin: add git-check-mailmap command
      e683889b
    • Junio C Hamano's avatar
      Merge branch 'jx/clean-interactive' · 988f98f6
      Junio C Hamano authored
      Add "interactive" mode to "git clean".
      
      The early part to refactor relative path related helper functions
      looked sensible.
      
      * jx/clean-interactive:
        test: run testcases with POSIX absolute paths on Windows
        test: add t7301 for git-clean--interactive
        git-clean: add documentation for interactive git-clean
        git-clean: add ask each interactive action
        git-clean: add select by numbers interactive action
        git-clean: add filter by pattern interactive action
        git-clean: use a git-add-interactive compatible UI
        git-clean: add colors to interactive git-clean
        git-clean: show items of del_list in columns
        git-clean: add support for -i/--interactive
        git-clean: refactor git-clean into two phases
        write_name{_quoted_relative,}(): remove redundant parameters
        quote_path_relative(): remove redundant parameter
        quote.c: substitute path_relative with relative_path
        path.c: refactor relative_path(), not only strip prefix
        test: add test cases for relative_path
      988f98f6
    • Junio C Hamano's avatar
      Merge branch 'hv/config-from-blob' · c714f9fd
      Junio C Hamano authored
      Allow configuration data to be read from in-tree blob objects,
      which would help working in a bare repository and submodule
      updates.
      
      * hv/config-from-blob:
        do not die when error in config parsing of buf occurs
        teach config --blob option to parse config from database
        config: make parsing stack struct independent from actual data source
        config: drop cf validity check in get_next_char()
        config: factor out config file stack management
      c714f9fd
    • Junio C Hamano's avatar
      Merge branch 'mk/upload-pack-off-by-one-dead-code-removal' · 4c72ee83
      Junio C Hamano authored
      * mk/upload-pack-off-by-one-dead-code-removal:
        upload-pack: remove a piece of dead code
      4c72ee83
    • Junio C Hamano's avatar
      Merge branch 'jk/t0008-sigpipe-fix' · a0c1aa21
      Junio C Hamano authored
      Fix for recent test breakage on 'master'.
      
      * jk/t0008-sigpipe-fix:
        t0008: avoid SIGPIPE race condition on fifo
      a0c1aa21
    • Junio C Hamano's avatar
      Merge branch 'nd/const-struct-cache-entry' · d3aeb31d
      Junio C Hamano authored
      * nd/const-struct-cache-entry:
        Convert "struct cache_entry *" to "const ..." wherever possible
      d3aeb31d
    • Junio C Hamano's avatar
      Merge branch 'jk/gcc-function-attributes' · e9f1a6c1
      Junio C Hamano authored
      Use the function attributes extension to catch mistakes in use of
      our own variadic functions that use NULL sentinel at the end
      (i.e. like execl(3)) and format strings (i.e. like printf(3)).
      
      * jk/gcc-function-attributes:
        Add the LAST_ARG_MUST_BE_NULL macro
        wt-status: use "format" function attribute for status_printf
        use "sentinel" function attribute for variadic lists
        add missing "format" function attributes
      e9f1a6c1
    • Junio C Hamano's avatar
      Merge branch 'db/show-ref-head' · d0b3fa8f
      Junio C Hamano authored
      The "--head" option to "git show-ref" was only to add "HEAD" to the
      list of candidate refs to be filtered by the usual rules
      (e.g. "--heads" that only show refs under refs/heads).  Change the
      meaning of the option to always show "HEAD" regardless of what
      filtering will be applied to any other ref (this is a backward
      incompatible change, so I may need to add an entry to the Release
      Notes).
      
      * db/show-ref-head:
        show-ref: make --head always show the HEAD ref
      d0b3fa8f
    • Junio C Hamano's avatar
      Merge branch 'es/blame-L-breakage' · e9682cc0
      Junio C Hamano authored
      The refactoring made for parsing "-L" option recently to support
      "git log -L" seems to have broken "git blame -L X,-5" to show 5
      lines leading to X.
      
      * es/blame-L-breakage:
        blame-options.txt: explain that -L <start> and <end> are optional
        blame-options.txt: place each -L option variation on its own line
        t8001/t8002 (blame): add blame -L :funcname tests
        t8001/t8002 (blame): add blame -L tests
        t8001/t8002 (blame): modernize style
        line-range: fix "blame -L X,-N" regression
      e9682cc0
    • Junio C Hamano's avatar
      Merge branch 'tr/protect-low-3-fds' · cb29dfde
      Junio C Hamano authored
      When "git" is spawned in such a way that any of the low 3 file
      descriptors is closed, our first open() may yield file descriptor 2,
      and writing error message to it would screw things up in a big way.
      
      * tr/protect-low-3-fds:
        git: ensure 0/1/2 are open in main()
        daemon/shell: refactor redirection of 0/1/2 from /dev/null
      cb29dfde
    • Junio C Hamano's avatar
      Merge branch 'sb/parse-object-buffer-eaten' · 5701c3d7
      Junio C Hamano authored
      * sb/parse-object-buffer-eaten:
        parse_object_buffer: correct freeing the buffer
      5701c3d7
    • Junio C Hamano's avatar
      Merge branch 'tr/do-not-call-submodules-subprojects' · 4ca8ae71
      Junio C Hamano authored
      * tr/do-not-call-submodules-subprojects:
        show-branch: fix description of --date-order
        apply, entry: speak of submodules instead of subprojects
      4ca8ae71
    • Junio C Hamano's avatar
      Merge branch 'mm/diff-no-patch-synonym-to-s' · e2ecd252
      Junio C Hamano authored
      "git show -s" was less discoverable than it should be.
      
      * mm/diff-no-patch-synonym-to-s:
        Documentation/git-log.txt: capitalize section names
        Documentation: move description of -s, --no-patch to diff-options.txt
        Documentation/git-show.txt: include common diff options, like git-log.txt
        diff: allow --patch & cie to override -s/--no-patch
        diff: allow --no-patch as synonym for -s
        t4000-diff-format.sh: modernize style
      e2ecd252
    • Junio C Hamano's avatar
      Merge branch 'dw/request-pull-diag' · 8827a58c
      Junio C Hamano authored
      * dw/request-pull-diag:
        request-pull: improve error message for invalid revision args
      8827a58c
    • Junio C Hamano's avatar
      Merge branch 'jc/mailmap-case-insensitivity' · fbf59cdb
      Junio C Hamano authored
      The mailmap mechanism unnecessarily downcased the e-mail addresses
      in the output, and also ignored the human name when it is a single
      character name.
      
      This now has become Eric Sunshine's series, even though it still is
      under jc/ hierarchy.
      
      * jc/mailmap-case-insensitivity:
        mailmap: style fixes
        mailmap: debug: avoid passing NULL to fprintf() '%s' conversion specification
        mailmap: debug: eliminate -Wformat field precision type warning
        mailmap: debug: fix malformed fprintf() format conversion specification
        mailmap: debug: fix out-of-order fprintf() arguments
        mailmap: do not downcase mailmap entries
        t4203: demonstrate loss of uppercase characters in canonical email
        mailmap: do not lose single-letter names
        t4203: demonstrate loss of single-character name in mailmap entry
      fbf59cdb
    • Junio C Hamano's avatar
      Merge branch 'tr/fd-gotcha-fixes' · 1d1934ca
      Junio C Hamano authored
      Two places we did not check return value (expected to be a file
      descriptor) correctly.
      
      * tr/fd-gotcha-fixes:
        run-command: dup_devnull(): guard against syscalls failing
        git_mkstemps: correctly test return value of open()
      1d1934ca
    • Junio C Hamano's avatar
      Merge branch 'mm/color-auto-default' · 6a5b9ce5
      Junio C Hamano authored
      A finishing touch to fix breakage to "add -e" caused by defaulting
      ui.color to "auto".
      
      * mm/color-auto-default:
        git add -e: Explicitly specify that patch should have no color
      6a5b9ce5
    • Junio C Hamano's avatar
      Merge branch 'jc/simple-add-must-be-a-no-op' · 06cbc13c
      Junio C Hamano authored
      This detected a mismerge of one of "add-2.0" topics to the 'jch'
      and 'pu' branches.
      
      * jc/simple-add-must-be-a-no-op:
        t2202: make sure "git add" (no args) stays a no-op
      06cbc13c
    • Junio C Hamano's avatar
      Git 1.8.3.4 · 117eea7e
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      117eea7e
    • Ondřej Bílka's avatar
      update URL to the marc.info mail archive · efe6de6e
      Ondřej Bílka authored
      The name marc.theaimsgroup.com is no longer active, and has
      migrated to marc.info.
      Signed-off-by: default avatarOndřej Bílka <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      efe6de6e
    • Junio C Hamano's avatar
      Sync with maint · 805c5a57
      Junio C Hamano authored
      * maint:
        Update draft release notes to 1.8.3.4
        t9801: git-p4: check ignore files with client spec
      805c5a57
    • Junio C Hamano's avatar
      Update draft release notes to 1.8.3.4 · 31fe4057
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      31fe4057
    • Junio C Hamano's avatar
      Merge branch 'rr/maint-fetch-tag-doc-asterisks' into maint · 281ff456
      Junio C Hamano authored
      * rr/maint-fetch-tag-doc-asterisks:
        fetch-options.txt: prevent a wildcard refspec from getting misformatted
      281ff456
    • Junio C Hamano's avatar
      Merge branch 'dk/maint-t5150-dirname' into maint · 5607c74d
      Junio C Hamano authored
      * dk/maint-t5150-dirname:
        tests: allow sha1's as part of the path
      5607c74d
    • Junio C Hamano's avatar
      Merge branch 'dk/version-gen-gitdir' into maint · 25b3e4ff
      Junio C Hamano authored
      * dk/version-gen-gitdir:
        GIT-VERSION-GEN: support non-standard $GIT_DIR path
      25b3e4ff
    • Junio C Hamano's avatar
      Merge branch 'nk/config-local-doc' into maint · b6538a0b
      Junio C Hamano authored
      * nk/config-local-doc:
        config: Add description of --local option
      b6538a0b
    • Junio C Hamano's avatar
      Merge branch 'kb/diff-blob-blob-doc' into maint · eac00c50
      Junio C Hamano authored
      * kb/diff-blob-blob-doc:
        Documentation: Move "git diff <blob> <blob>"
      eac00c50
    • Junio C Hamano's avatar
      Merge branch 'mm/merge-in-dirty-worktree-doc' into maint · 4f9f1f5d
      Junio C Hamano authored
      * mm/merge-in-dirty-worktree-doc:
        Documentation/git-merge.txt: weaken warning about uncommited changes
      4f9f1f5d
    • Junio C Hamano's avatar
      Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maint · 80f07439
      Junio C Hamano authored
      * ph/builtin-srcs-are-in-subdir-these-days:
        fix "builtin-*" references to be "builtin/*"
      80f07439
    • Junio C Hamano's avatar
      Merge branch 'ft/doc-git-transport' into maint · 8c091d91
      Junio C Hamano authored
      * ft/doc-git-transport:
        documentation: add git:// transport security notice
      8c091d91
    • Junio C Hamano's avatar
      Merge branch 'mh/maint-lockfile-overflow' into maint · dbed5935
      Junio C Hamano authored
      * mh/maint-lockfile-overflow:
        lockfile: fix buffer overflow in path handling
      dbed5935
    • Junio C Hamano's avatar
      Merge branch 'jc/maint-diff-core-safecrlf' into maint · 82ec54dc
      Junio C Hamano authored
      Avoid failing "git diff" when core.safecrlf is set to true, because
      the user cannot tell where the breakage is in preparation for fixing
      and committing.
      
      * jc/maint-diff-core-safecrlf:
        diff: demote core.safecrlf=true to core.safecrlf=warn
      82ec54dc
  2. 21 Jul, 2013 1 commit
  3. 20 Jul, 2013 1 commit