1. 06 4月, 2013 2 次提交
    • J
      Merge branch 'rr/send-email-perl-critique' · cb660275
      Junio C Hamano 提交于
      Update "git send-email" for issues noticed by PerlCritic.
      
      * rr/send-email-perl-critique:
        send-email: use the three-arg form of open in recipients_cmd
        send-email: drop misleading function prototype
        send-email: use "return;" not "return undef;" on error codepaths
      cb660275
    • J
      Merge branch 'jc/merge-tag-object' · e636241f
      Junio C Hamano 提交于
      "git merge $(git rev-parse v1.8.2)" behaved quite differently from
      "git merge v1.8.2" as if v1.8.2 were written as v1.8.2^0 and did
      not pay much attention to the annotated tag payload.
      
      This makes the code notice the type of the tag object, in addition
      to the dwim_ref() based classification the current code uses
      (i.e. the name appears in refs/tags/) to decide when to special
      case merging of tags.
      
      * jc/merge-tag-object:
        t6200: test message for merging of an annotated tag
        t6200: use test_config/test_unconfig
        merge: a random object may not necssarily be a commit
      e636241f
  2. 05 4月, 2013 7 次提交
  3. 04 4月, 2013 25 次提交
    • J
      Update draft release notes to 1.8.3 · 8d994db4
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      8d994db4
    • J
      Sync with maint · 260dba5d
      Junio C Hamano 提交于
      260dba5d
    • J
      Merge branch 'jc/sha1-name-object-peeler' · 1b7b22bf
      Junio C Hamano 提交于
      There was no good way to ask "I have a random string that came from
      outside world. I want to turn it into a 40-hex object name while
      making sure such an object exists".  A new peeling suffix ^{object}
      can be used for that purpose, together with "rev-parse --verify".
      
      * jc/sha1-name-object-peeler:
        peel_onion(): teach $foo^{object} peeler
        peel_onion: disambiguate to favor tree-ish when we know we want a tree-ish
      1b7b22bf
    • J
      Merge branch 'jc/t5516-pushInsteadOf-vs-pushURL' · 41ae34d1
      Junio C Hamano 提交于
      Update a test to match the documented interaction between pushURL
      and pushInsteadOf.
      
      * jc/t5516-pushInsteadOf-vs-pushURL:
        t5516: test interaction between pushURL and pushInsteadOf correctly
      41ae34d1
    • J
      Merge branch 'rs/submodule-summary-limit' · e3b1173f
      Junio C Hamano 提交于
      "submodule summary --summary-limit" option did not support
      "--option=value" form.
      
      * rs/submodule-summary-limit:
        submodule summary: support --summary-limit=<n>
      e3b1173f
    • J
      Merge branch 'tr/valgrind' · d3ea5826
      Junio C Hamano 提交于
      Let us use not just memgrind but other *grind debuggers.
      
      * tr/valgrind:
        tests: notice valgrind error in test_must_fail
        tests --valgrind: provide a mode without --track-origins
        tests: parameterize --valgrind option
        t/README: --valgrind already implies -v
      d3ea5826
    • J
      Merge branch 'rr/prompt-revert-head' · 5ab3e4c1
      Junio C Hamano 提交于
      The prompt string generator did not notice when we are in a middle
      of a "git revert" session.
      
      * rr/prompt-revert-head:
        bash: teach __git_ps1 about REVERT_HEAD
      5ab3e4c1
    • J
      Merge branch 'jm/branch-rename-nothing-error' · 8054b9a6
      Junio C Hamano 提交于
      "git branch -m" without any argument noticed an error, but with an
      incorrect error message.
      
      * jm/branch-rename-nothing-error:
        branch: give better message when no names specified for rename
      8054b9a6
    • J
      Merge branch 'js/iterm-is-on-osx' · ed23f31b
      Junio C Hamano 提交于
      Add more logic to detect graphic environment of OS X by simply
      checking TERM_PROGRAM has some value, not Apple_Terminal, to detect
      iTerm.app and any other.
      
      * js/iterm-is-on-osx:
        git-web--browse: recognize any TERM_PROGRAM as a GUI terminal on OS X
      ed23f31b
    • J
      Merge branch 'jk/check-corrupt-objects-carefully' · b9c78e97
      Junio C Hamano 提交于
      Have the streaming interface and other codepaths more carefully
      examine for corrupt objects.
      
      * jk/check-corrupt-objects-carefully:
        clone: leave repo in place after checkout errors
        clone: run check_everything_connected
        clone: die on errors from unpack_trees
        add tests for cloning corrupted repositories
        streaming_write_entry: propagate streaming errors
        add test for streaming corrupt blobs
        avoid infinite loop in read_istream_loose
        read_istream_filtered: propagate read error from upstream
        check_sha1_signature: check return value from read_istream
        stream_blob_to_fd: detect errors reading from stream
      b9c78e97
    • J
      Merge branch 'jc/apply-ws-fix-tab-in-indent' · a70f4cb5
      Junio C Hamano 提交于
      "git apply --whitespace=fix" was not prepared to see a line getting
      longer after fixing whitespaces (e.g. tab-in-indent aka Python).
      
      * jc/apply-ws-fix-tab-in-indent:
        test: resurrect q_to_tab
        apply --whitespace=fix: avoid running over the postimage buffer
      a70f4cb5
    • J
      Merge branch 'jk/difftool-no-overwrite-on-copyback' · 288e6ff5
      Junio C Hamano 提交于
      Try to be careful when difftool backend allows the user to write
      into the temporary files being shown *and* the user makes changes
      to the working tree at the same time. One of the changes has to be
      lost in such a case, but at least tell the user what he did.
      
      * jk/difftool-no-overwrite-on-copyback:
        t7800: run --dir-diff tests with and without symlinks
        t7800: fix tests when difftool uses --no-symlinks
        t7800: don't hide grep output
        difftool: don't overwrite modified files
        t7800: move '--symlinks' specific test to the end
      288e6ff5
    • J
      Merge branch 'jc/directory-attrs-regression-fix' · f30366b2
      Junio C Hamano 提交于
      Fix 1.8.1.x regression that stopped matching "dir" (without
      trailing slash) to a directory "dir".
      
      * jc/directory-attrs-regression-fix:
        t: check that a pattern without trailing slash matches a directory
        dir.c::match_pathname(): pay attention to the length of string parameters
        dir.c::match_pathname(): adjust patternlen when shifting pattern
        dir.c::match_basename(): pay attention to the length of string parameters
        attr.c::path_matches(): special case paths that end with a slash
        attr.c::path_matches(): the basename is part of the pathname
      f30366b2
    • J
      Merge branch 'nd/checkout-paths-reduce-match-pathspec-calls' · 97fefaf6
      Junio C Hamano 提交于
      Consolidate repeated pathspec matches on the same paths, while
      fixing a bug in "git checkout dir/" code started from an unmerged
      index.
      
      * nd/checkout-paths-reduce-match-pathspec-calls:
        checkout: avoid unnecessary match_pathspec calls
      97fefaf6
    • J
      Update draft release notes to 1.8.2.1 · 19534ee8
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      19534ee8
    • J
      Merge branch 'mg/gpg-interface-using-status' into maint · b771d8d7
      Junio C Hamano 提交于
      Verification of signed tags were not done correctly when not in C
      or en/US locale.
      
      * mg/gpg-interface-using-status:
        pretty: make %GK output the signing key for signed commits
        pretty: parse the gpg status lines rather than the output
        gpg_interface: allow to request status return
        log-tree: rely upon the check in the gpg_interface
        gpg-interface: check good signature in a reliable way
      b771d8d7
    • J
      Merge branch 'bc/commit-complete-lines-given-via-m-option' into maint · 14c79b1f
      Junio C Hamano 提交于
      'git commit -m "$msg"' used to add an extra newline even when
      $msg already ended with one.
      
      * bc/commit-complete-lines-given-via-m-option:
        Documentation/git-commit.txt: rework the --cleanup section
        git-commit: only append a newline to -m mesg if necessary
        t7502: demonstrate breakage with a commit message with trailing newlines
        t/t7502: compare entire commit message with what was expected
      14c79b1f
    • J
      Merge branch 'jc/describe' into maint · 295e3938
      Junio C Hamano 提交于
      The "--match=<pattern>" option of "git describe", when used with
      "--all" to allow refs that are not annotated tags to be used as a
      base of description, did not restrict the output from the command to
      those that match the given pattern.
      
      * jc/describe:
        describe: --match=<pattern> must limit the refs even when used with --all
      295e3938
    • J
      Merge branch 'jk/alias-in-bare' into maint · eeecf393
      Junio C Hamano 提交于
      An aliased command spawned from a bare repository that does not say
      it is bare with "core.bare = yes" is treated as non-bare by mistake.
      
      * jk/alias-in-bare:
        setup: suppress implicit "." work-tree for bare repos
        environment: add GIT_PREFIX to local_repo_env
        cache.h: drop LOCAL_REPO_ENV_SIZE
      eeecf393
    • J
      Merge branch 'ks/rfc2047-one-char-at-a-time' into maint · e6658b9d
      Junio C Hamano 提交于
      When "format-patch" quoted a non-ascii strings on the header files,
      it incorrectly applied rfc2047 and chopped a single character in the
      middle of it.
      
      * ks/rfc2047-one-char-at-a-time:
        format-patch: RFC 2047 says multi-octet character may not be split
      e6658b9d
    • J
      Merge branch 'jk/empty-archive' into maint · a9dc3b64
      Junio C Hamano 提交于
      "git archive" reports a failure when asked to create an archive out
      of an empty tree.  It would be more intuitive to give an empty
      archive back in such a case.
      
      * jk/empty-archive:
        archive: handle commits with an empty tree
        test-lib: factor out $GIT_UNZIP setup
      a9dc3b64
    • J
      Merge branch 'ph/tag-force-no-warn-on-creation' into maint · 9e72a566
      Junio C Hamano 提交于
      "git tag -f <tag>" always said "Updated tag '<tag>'" even when
      creating a new tag (i.e. not overwriting nor updating).
      
      * ph/tag-force-no-warn-on-creation:
        tag: --force does not have to warn when creating tags
      9e72a566
    • J
      Merge branch 'lf/setup-prefix-pathspec' into maint · fa0a6a48
      Junio C Hamano 提交于
      "git cmd -- ':(top'" was not diagnosed as an invalid syntax, and
      instead the parser kept reading beyond the end of the string.
      
      * lf/setup-prefix-pathspec:
        setup.c: check that the pathspec magic ends with ")"
        setup.c: stop prefix_pathspec() from looping past the end of string
      fa0a6a48
    • J
      Sync with 1.8.1 maintenance track · 92e0d916
      Junio C Hamano 提交于
      * maint-1.8.1:
        Start preparing for 1.8.1.6
        git-tag(1): we tag HEAD by default
        Fix revision walk for commits with the same dates
        t2003: work around path mangling issue on Windows
        pack-refs: add fully-peeled trait
        pack-refs: write peeled entry for non-tags
        use parse_object_or_die instead of die("bad object")
        avoid segfaults on parse_object failure
        entry: fix filter lookup
        t2003: modernize style
        name-hash.c: fix endless loop with core.ignorecase=true
      92e0d916
    • J
      Start preparing for 1.8.1.6 · 072dda68
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      072dda68
  4. 03 4月, 2013 6 次提交