1. 23 Jan, 2013 2 commits
  2. 12 Jan, 2013 22 commits
    • Junio C Hamano's avatar
      Update draft release notes to 1.8.2 · 94702dd1
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      94702dd1
    • Junio C Hamano's avatar
      Merge branch 'jk/maint-fast-import-doc-reorder' · a96e8078
      Junio C Hamano authored
      * jk/maint-fast-import-doc-reorder:
        git-fast-import(1): reorganise options
        git-fast-import(1): combine documentation of --[no-]relative-marks
      a96e8078
    • Junio C Hamano's avatar
      Merge branch 'jk/shortlog-no-wrap-doc' · 79637a44
      Junio C Hamano authored
      * jk/shortlog-no-wrap-doc:
        git-shortlog(1): document behaviour of zero-width wrap
      79637a44
    • Junio C Hamano's avatar
      Merge branch 'rs/zip-with-uncompressed-size-in-the-header' · d9f85f50
      Junio C Hamano authored
      Improve compatibility of our zip output to fill uncompressed size
      in the header, which we can do without seeking back (even though it
      should not be necessary).
      
      * rs/zip-with-uncompressed-size-in-the-header:
        archive-zip: write uncompressed size into header even with streaming
      d9f85f50
    • Junio C Hamano's avatar
      Merge branch 'rs/zip-tests' · bf3f167d
      Junio C Hamano authored
      Update zip tests to skip some that cannot be handled on platform
      unzip.
      
      * rs/zip-tests:
        t5003: check if unzip supports symlinks
        t5000, t5003: move ZIP tests into their own script
        t0024, t5000: use test_lazy_prereq for UNZIP
        t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead
      bf3f167d
    • Junio C Hamano's avatar
      Merge branch 'jn/xml-depends-on-asciidoc-conf' · 1eba20c0
      Junio C Hamano authored
      * jn/xml-depends-on-asciidoc-conf:
        docs: manpage XML depends on asciidoc.conf
      1eba20c0
    • Junio C Hamano's avatar
      Merge branch 'jk/unify-exit-code-by-receiving-signal' · edb6ad5b
      Junio C Hamano authored
      The internal logic had to deal with two representations of a death
      of a child process by a signal.
      
      * jk/unify-exit-code-by-receiving-signal:
        run-command: encode signal death as a positive integer
      edb6ad5b
    • Junio C Hamano's avatar
      Merge branch 'jc/merge-blobs' · c566ea13
      Junio C Hamano authored
      Update the disused merge-tree proof-of-concept code.
      
      * jc/merge-blobs:
        merge-tree: fix d/f conflicts
        merge-tree: add comments to clarify what these functions are doing
        merge-tree: lose unused "resolve_directories"
        merge-tree: lose unused "flags" from merge_list
        Which merge_file() function do you mean?
      c566ea13
    • Junio C Hamano's avatar
      Merge branch 'jc/format-patch-reroll' · 98294e98
      Junio C Hamano authored
      Teach "format-patch" to prefix v4- to its output files for the
      fourth iteration of a patch series, to make it easier for the
      submitter to keep separate copies for iterations.
      
      * jc/format-patch-reroll:
        format-patch: give --reroll-count a short synonym -v
        format-patch: document and test --reroll-count
        format-patch: add --reroll-count=$N option
        get_patch_filename(): split into two functions
        get_patch_filename(): drop "just-numbers" hack
        get_patch_filename(): simplify function signature
        builtin/log.c: stop using global patch_suffix
        builtin/log.c: drop redundant "numbered_files" parameter from make_cover_letter()
        builtin/log.c: drop unused "numbered" parameter from make_cover_letter()
      98294e98
    • Junio C Hamano's avatar
      Merge branch 'maint' · 06fb4944
      Junio C Hamano authored
      06fb4944
    • Junio C Hamano's avatar
      Merge branch 'as/api-allocation-doc' into maint · ab60f2ce
      Junio C Hamano authored
      * as/api-allocation-doc:
        api-allocation-growing.txt: encourage better variable naming
      ab60f2ce
    • Junio C Hamano's avatar
      Merge branch 'jk/enable-test-lint-by-default' into maint · d0f94562
      Junio C Hamano authored
      We have two simple and quick tests to catch common mistakes when
      writing test scripts, but we did not run them by default when
      running tests.
      
      * jk/enable-test-lint-by-default:
        tests: turn on test-lint by default
      d0f94562
    • Junio C Hamano's avatar
      Merge branch 'ap/merge-stop-at-prepare-commit-msg-failure' into maint · b663af57
      Junio C Hamano authored
      "git merge" started calling prepare-commit-msg hook like "git
      commit" does some time ago, but forgot to pay attention to the exit
      status of the hook.
      
      * ap/merge-stop-at-prepare-commit-msg-failure:
        merge: Honor prepare-commit-msg return code
      b663af57
    • Junio C Hamano's avatar
      Merge branch 'jc/submittingpatches' into maint · 02cb8da2
      Junio C Hamano authored
      * jc/submittingpatches:
        SubmittingPatches: give list and maintainer addresses
        SubmittingPatches: remove overlong checklist
        SubmittingPatches: mention subsystems with dedicated repositories
        SubmittingPatches: who am I and who cares?
      02cb8da2
    • Junio C Hamano's avatar
      Merge branch 'os/gitweb-highlight-uncaptured' into maint · 23ad6177
      Junio C Hamano authored
      "gitweb", when sorting by age to show repositories with new
      activities first, used to sort repositories with absolutely nothing
      in it early, which was not very useful.
      
      * os/gitweb-highlight-uncaptured:
        gitweb: fix error in sanitize when highlight is enabled
      23ad6177
    • Junio C Hamano's avatar
      Merge branch 'jn/less-reconfigure' into maint · 378e5e4d
      Junio C Hamano authored
      When autoconf is used, any build on a different commit always ran
      "config.status --recheck" even when unnecessary.
      
      * jn/less-reconfigure:
        build: do not automatically reconfigure unless configure.ac changed
      378e5e4d
    • Junio C Hamano's avatar
      Merge branch 'kb/maint-bundle-doc' into maint · 37a11306
      Junio C Hamano authored
      * kb/maint-bundle-doc:
        Documentation: full-ness of a bundle is significant for cloning
        Documentation: correct example restore from bundle
      37a11306
    • Junio C Hamano's avatar
      Merge branch 'as/test-name-alias-uniquely' into maint · b88cb881
      Junio C Hamano authored
      * as/test-name-alias-uniquely:
        Use longer alias names in subdirectory tests
      b88cb881
    • Junio C Hamano's avatar
      Merge branch 'jn/warn-on-inaccessible-loosen' into maint · e6f1550a
      Junio C Hamano authored
      When attempting to read the XDG-style $HOME/.config/git/config and
      finding that $HOME/.config/git is a file, we gave a wrong error
      message, instead of treating the case as "a custom config file does
      not exist there" and moving on.
      
      * jn/warn-on-inaccessible-loosen:
        config: exit on error accessing any config file
        doc: advertise GIT_CONFIG_NOSYSTEM
        config: treat user and xdg config permission problems as errors
        config, gitignore: failure to access with ENOTDIR is ok
      e6f1550a
    • Junio C Hamano's avatar
      Merge branch 'ja/directory-attrs' into maint · 22fd1c84
      Junio C Hamano authored
      The attribute mechanism didn't allow limiting attributes to be
      applied to only a single directory itself with "path/" like the
      exclude mechanism does.
      
      * ja/directory-attrs:
        Add directory pattern matching to attributes
      22fd1c84
    • Junio C Hamano's avatar
      Merge branch 'jc/fetch-ignore-symref' into maint · c039f35b
      Junio C Hamano authored
      "git fetch --mirror" and fetch that uses other forms of refspec with
      wildcard used to attempt to update a symbolic ref that match the
      wildcard on the receiving end, which made little sense (the real ref
      that is pointed at by the symbolic ref would be updated anyway).
      
      Symbolic refs no longer are affected by such a fetch.
      
      * jc/fetch-ignore-symref:
        fetch: ignore wildcarded refspecs that update local symbolic refs
      c039f35b
    • Junio C Hamano's avatar
      Merge branch 'ss/svn-prompt' into maint · 9a4a941e
      Junio C Hamano authored
      The way "git svn" asked for password using SSH_ASKPASS and
      GIT_ASKPASS was not in line with the rest of the system.
      
      * ss/svn-prompt:
        git-svn, perl/Git.pm: extend and use Git->prompt method for querying users
        perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set
        git-svn, perl/Git.pm: add central method for prompting passwords
      9a4a941e
  3. 10 Jan, 2013 16 commits