This project is mirrored from https://github.com/git/git. Pull mirroring updated .
  1. 12 Sep, 2012 10 commits
  2. 07 Sep, 2012 14 commits
    • Junio C Hamano's avatar
      The fourth batch for 1.8.0 · 0ce98644
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      0ce98644
    • Junio C Hamano's avatar
      Merge branch 'nd/branch-v-alignment' · 8023a422
      Junio C Hamano authored
      Output from "git branch -v" contains "(no branch)" that could be
      localized, but the code to align it along with the names of branches
      were counting in bytes, not in display columns.
      
      * nd/branch-v-alignment:
        branch -v: align even when branch names are in UTF-8
      8023a422
    • Junio C Hamano's avatar
      Merge branch 'jk/maint-http-half-auth-push' · e6dd70e9
      Junio C Hamano authored
      Pushing to smart HTTP server with recent Git fails without having
      the username in the URL to force authentication, if the server is
      configured to allow GET anonymously, while requiring authentication
      for POST.
      
      * jk/maint-http-half-auth-push:
        http: prompt for credentials on failed POST
        http: factor out http error code handling
        t: test http access to "half-auth" repositories
        t: test basic smart-http authentication
        t/lib-httpd: recognize */smart/* repos as smart-http
        t/lib-httpd: only route auth/dumb to dumb repos
        t5550: factor out http auth setup
        t5550: put auth-required repo in auth/dumb
      e6dd70e9
    • Junio C Hamano's avatar
      Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name' · 9192ece9
      Junio C Hamano authored
      The synopsis said "checkout [-B branch]" to make it clear the branch
      name is a parameter to the option, but the heading for the option
      description was "-B::", not "-B branch::", making the documentation
      misleading.  There may be room in documentation pages of other
      commands for similar improvements.
      
      * jc/maint-doc-checkout-b-always-takes-branch-name:
        doc: "git checkout -b/-B/--orphan" always takes a branch name
      9192ece9
    • Junio C Hamano's avatar
      Merge branch 'jc/apply-binary-p0' · 757bf26c
      Junio C Hamano authored
      "git apply -p0" did not parse pathnames on "diff --git" line
      correctly.  This caused patches that had pathnames in no other
      places to be mistakenly rejected (most notably, binary patch that
      does not rename nor change mode).  Textual patches, renames or
      mode changes have preimage and postimage pathnames in different
      places in a form that can be parsed unambiguously and did not suffer
      from this problem.
      
      * jc/apply-binary-p0:
        apply: compute patch->def_name correctly under -p0
      757bf26c
    • Junio C Hamano's avatar
      Merge branch 'jc/dotdot-is-parent-directory' · 7764a3b3
      Junio C Hamano authored
      "git log .." errored out saying it is both rev range and a path when
      there is no disambiguating "--" is on the command line.  Update the
      command line parser to interpret ".." as a path in such a case.
      
      * jc/dotdot-is-parent-directory:
        specifying ranges: we did not mean to make ".." an empty set
      7764a3b3
    • Junio C Hamano's avatar
      Merge branch 'nd/i18n-parseopt-help' · 096bbd65
      Junio C Hamano authored
      A lot of i18n mark-up for the help text from "git <cmd> -h".
      
      * nd/i18n-parseopt-help: (66 commits)
        Use imperative form in help usage to describe an action
        Reduce translations by using same terminologies
        i18n: write-tree: mark parseopt strings for translation
        i18n: verify-tag: mark parseopt strings for translation
        i18n: verify-pack: mark parseopt strings for translation
        i18n: update-server-info: mark parseopt strings for translation
        i18n: update-ref: mark parseopt strings for translation
        i18n: update-index: mark parseopt strings for translation
        i18n: tag: mark parseopt strings for translation
        i18n: symbolic-ref: mark parseopt strings for translation
        i18n: show-ref: mark parseopt strings for translation
        i18n: show-branch: mark parseopt strings for translation
        i18n: shortlog: mark parseopt strings for translation
        i18n: rm: mark parseopt strings for translation
        i18n: revert, cherry-pick: mark parseopt strings for translation
        i18n: rev-parse: mark parseopt strings for translation
        i18n: reset: mark parseopt strings for translation
        i18n: rerere: mark parseopt strings for translation
        i18n: status: mark parseopt strings for translation
        i18n: replace: mark parseopt strings for translation
        ...
      096bbd65
    • Junio C Hamano's avatar
      Merge branch 'nd/am-i18n-fix' · e2453974
      Junio C Hamano authored
      "git am" wasn't marked up for i18n properly.
      
      * nd/am-i18n-fix:
        am: quote string for translation before passing to eval_gettextln
      e2453974
    • Junio C Hamano's avatar
      Merge branch 'jk/config-warn-on-inaccessible-paths' · 7fe136d7
      Junio C Hamano authored
      When looking for $HOME/.gitconfig etc., it is OK if we cannot read
      them because they do not exist, but we did not diagnose existing
      files that we cannot read.
      
      * jk/config-warn-on-inaccessible-paths:
        warn_on_inaccessible(): a helper to warn on inaccessible paths
        attr: warn on inaccessible attribute files
        gitignore: report access errors of exclude files
        config: warn on inaccessible files
      7fe136d7
    • Junio C Hamano's avatar
      Merge branch 'kk/maint-for-each-ref-multi-sort' · 09827f2a
      Junio C Hamano authored
      "git for-each-ref" did not currectly support more than one --sort
      option.
      
      * kk/maint-for-each-ref-multi-sort:
        for-each-ref: Fix sort with multiple keys
        t6300: test sort with multiple keys
      09827f2a
    • Junio C Hamano's avatar
      Merge branch 'lt/commit-tree-guess-utf-8' · ae80b5a8
      Junio C Hamano authored
      Teach "git commit" and "git commit-tree" the "we are told to use
      utf-8 in log message, but this does not look like utf-8---attempt to
      pass it through convert-from-latin1-to-utf8 and see if it makes
      sense" heuristics "git mailinfo" already uses.
      
      * lt/commit-tree-guess-utf-8:
        commit/commit-tree: correct latin1 to utf-8
      ae80b5a8
    • Junio C Hamano's avatar
      Merge branch 'pw/p4-use-client-spec-branch-detection' · 7c88ec05
      Junio C Hamano authored
      Fix "git p4" when "--use-client-spec" and "--detect-branches" are
      used together (the command used to misdetect branches).
      
      * pw/p4-use-client-spec-branch-detection:
        git p4: make branch detection work with --use-client-spec
        git p4: do wildcard decoding in stripRepoPath
        git p4: set self.branchPrefixes in initialization
        git p4 test: add broken --use-client-spec --detect-branches tests
        git p4 test: move client_view() function to library
      7c88ec05
    • Junio C Hamano's avatar
      Merge branch 'tr/maint-parseopt-avoid-empty' · 800981f4
      Junio C Hamano authored
      A workaround to avoid doing _(""), which translates to unwanted
      magic string in the .po files.
      
      * tr/maint-parseopt-avoid-empty:
        gettext: do not translate empty string
      800981f4
    • Junio C Hamano's avatar
      Merge branch 'nd/i18n-poison-test-updates' · bdac5784
      Junio C Hamano authored
      Update tests that can be broken with gettext-poison builds.
      
      * nd/i18n-poison-test-updates:
        Fix tests under GETTEXT_POISON on parseopt
        Fix tests under GETTEXT_POISON on git-remote
        Fix tests under GETTEXT_POISON on pack-object
        Fix tests under GETTEXT_POISON on git-apply
        Fix tests under GETTEXT_POISON on diffstat
        Fix tests under GETTEXT_POISON on git-stash
        Fix tests under GETTEXT_POISON on relative dates
      bdac5784
  3. 03 Sep, 2012 13 commits
  4. 29 Aug, 2012 3 commits