This project is mirrored from https://github.com/git/git. Pull mirroring updated .
  1. 25 Mar, 2014 14 commits
  2. 21 Mar, 2014 10 commits
    • Junio C Hamano's avatar
      Update draft release notes to 2.0 · 3f09db07
      Junio C Hamano authored
      3f09db07
    • Junio C Hamano's avatar
      Merge branch 'lt/request-pull' · fe3623c6
      Junio C Hamano authored
      Discard the accumulated "heuristics" to guess from which branch the
      result wants to be pulled from and make sure what the end user
      specified is not second-guessed by "git request-pull", to avoid
      mistakes.
      
      * lt/request-pull:
        request-pull: documentation updates
        request-pull: resurrect "pretty refname" feature
        request-pull: test updates
        request-pull: pick up tag message as before
        request-pull: allow "local:remote" to specify names on both ends
        request-pull: more strictly match local/remote branches
      fe3623c6
    • Junio C Hamano's avatar
      Merge branch 'es/sh-i18n-envsubst' · 53d7d1b1
      Junio C Hamano authored
      * es/sh-i18n-envsubst:
        sh-i18n--envsubst: retire unused string_list_member()
      53d7d1b1
    • Junio C Hamano's avatar
      Merge branch 'nd/upload-pack-shallow' · 1ddb4d7e
      Junio C Hamano authored
      Serving objects from a shallow repository needs to write a
      temporary file to be used, but the serving upload-pack may not have
      write access to the repository which is meant to be read-only.
      
      Instead feed these temporary shallow bounds from the standard input
      of pack-objects so that we do not have to use a temporary file.
      
      * nd/upload-pack-shallow:
        upload-pack: send shallow info over stdin to pack-objects
      1ddb4d7e
    • Junio C Hamano's avatar
      Merge branch 'jn/wt-status' · 6dada01b
      Junio C Hamano authored
      Unify the codepaths that format new/modified/changed sections and
      conflicted paths in the "git status" output and make it possible to
      properly internationalize their output.
      
      * jn/wt-status:
        wt-status: lift the artificual "at least 20 columns" floor
        wt-status: i18n of section labels
        wt-status: extract the code to compute width for labels
        wt-status: make full label string to be subject to l10n
      6dada01b
    • Junio C Hamano's avatar
      Merge branch 'jc/stash-pop-not-popped' · 10bdb20d
      Junio C Hamano authored
      "stash pop", upon failing to apply the stash, refrains from
      discarding the stash to avoid information loss.  Be more explicit
      in the error message.
      
      The wording may want to get a bit more bikeshedding.
      
      * jc/stash-pop-not-popped:
        stash pop: mention we did not drop the stash upon failing to apply
      10bdb20d
    • Junio C Hamano's avatar
      Merge branch 'dk/skip-prefix-scan-only-once' · 1be645c0
      Junio C Hamano authored
      Update implementation of skip_prefix() to scan only once; given
      that most "prefix" arguments to the inline function are constant
      strings whose strlen() can be determined at the compile time, this
      might actually make things worse with a compiler with sufficient
      intelligence.
      
      * dk/skip-prefix-scan-only-once:
        skip_prefix(): scan prefix only once
      1be645c0
    • Junio C Hamano's avatar
      Merge branch 'nd/tag-version-sort' · b6de0c63
      Junio C Hamano authored
      Allow v1.9.0 sorted before v1.10.0 in "git tag --list" output.
      
      * nd/tag-version-sort:
        tag: support --sort=<spec>
      b6de0c63
    • Junio C Hamano's avatar
      Merge branch 'jk/shallow-update-fix' · 3e14384b
      Junio C Hamano authored
      Serving objects from a shallow repository needs to write a
      new file to hold the temporary shallow boundaries but it was not
      cleaned when we exit due to die() or a signal.
      
      * jk/shallow-update-fix:
        shallow: verify shallow file after taking lock
        shallow: automatically clean up shallow tempfiles
        shallow: use stat_validity to check for up-to-date file
      3e14384b
    • Junio C Hamano's avatar
      Merge branch 'tc/commit-dry-run-exit-status-tests' · 4291cc10
      Junio C Hamano authored
      * tc/commit-dry-run-exit-status-tests:
        demonstrate git-commit --dry-run exit code behaviour
      4291cc10
  3. 19 Mar, 2014 3 commits
  4. 18 Mar, 2014 13 commits
    • Junio C Hamano's avatar
      Sync with 1.9.1 · 5172cb3b
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      5172cb3b
    • Junio C Hamano's avatar
      Update draft release notes to Git 2.0 · a35104fa
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      a35104fa
    • Junio C Hamano's avatar
      Git 1.9.1 · cee0c275
      Junio C Hamano authored
      The version numbering scheme has changed since Git 1.9 and we
      dropped the third dewey-decimal from the traditional numbering
      (e.g. both 1.8.4 and 1.8.5 were major feature releases).  This
      release 1.9.1 is the first maintenance relase for Git 1.9.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      cee0c275
    • Junio C Hamano's avatar
      Merge branch 'jk/clean-d-pathspec' into maint · 9526473f
      Junio C Hamano authored
      "git clean -d pathspec" did not use the given pathspec correctly
      and ended up cleaning too much.
      
      * jk/clean-d-pathspec:
        clean: simplify dir/not-dir logic
        clean: respect pathspecs with "-d"
      9526473f
    • Junio C Hamano's avatar
      Merge branch 'da/difftool-git-files' into maint · 01e13d02
      Junio C Hamano authored
      "git difftool" misbehaved when the repository is bound to the
      working tree with the ".git file" mechanism, where a textual file
      ".git" tells us where it is.
      
      * da/difftool-git-files:
        t7800: add a difftool test for .git-files
        difftool: support repositories with .git-files
      01e13d02
    • Junio C Hamano's avatar
      Merge branch 'jk/remote-pushremote-config-reading' into maint · 4097a254
      Junio C Hamano authored
      "git push" did not pay attention to branch.*.pushremote if it is
      defined earlier than remote.pushdefault; the order of these two
      variables in the configuration file should not matter, but it did by
      mistake.
      
      * jk/remote-pushremote-config-reading:
        remote: handle pushremote config in any order
      4097a254
    • Junio C Hamano's avatar
      Merge branch 'jk/commit-dates-parsing-fix' into maint · 8aac6c97
      Junio C Hamano authored
      Codepaths that parse timestamps in commit objects have been
      tightened.
      
      * jk/commit-dates-parsing-fix:
        show_ident_date: fix tz range check
        log: do not segfault on gmtime errors
        log: handle integer overflow in timestamps
        date: check date overflow against time_t
        fsck: report integer overflow in author timestamps
        t4212: test bogus timestamps with git-log
      8aac6c97
    • Junio C Hamano's avatar
      Merge branch 'tr/diff-submodule-no-reuse-worktree' into maint · a5aca6e8
      Junio C Hamano authored
      "git diff --external-diff" incorrectly fed the submodule directory
      in the working tree to the external diff driver when it knew it is
      the same as one of the versions being compared.
      
      * tr/diff-submodule-no-reuse-worktree:
        diff: do not reuse_worktree_file for submodules
      a5aca6e8
    • Junio C Hamano's avatar
      Merge branch 'nd/reset-setup-worktree' into maint · 1f569775
      Junio C Hamano authored
      "git reset" needs to refresh the index when working in a working
      tree (it can also be used to match the index to the HEAD in an
      otherwise bare repository), but it failed to set up the working
      tree properly, causing GIT_WORK_TREE to be ignored.
      
      * nd/reset-setup-worktree:
        reset: optionally setup worktree and refresh index on --mixed
      1f569775
    • Junio C Hamano's avatar
      Merge branch 'jc/check-attr-honor-working-tree' into maint · a8b31316
      Junio C Hamano authored
      "git check-attr" when working on a repository with a working tree
      did not work well when the working tree was specified via the
      --work-tree (and obviously with --git-dir) option.
      
      * jc/check-attr-honor-working-tree:
        check-attr: move to the top of working tree when in non-bare repository
        t0003: do not chdir the whole test process
      a8b31316
    • Junio C Hamano's avatar
      Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maint · 6d011b8e
      Junio C Hamano authored
      "merge-recursive" was broken in 1.7.7 era and stopped working in an
      empty (temporary) working tree, when there are renames involved.
      This has been corrected.
      
      * bk/refresh-missing-ok-in-merge-recursive:
        merge-recursive.c: tolerate missing files while refreshing index
        read-cache.c: extend make_cache_entry refresh flag with options
        read-cache.c: refactor --ignore-missing implementation
        t3030-merge-recursive: test known breakage with empty work tree
      6d011b8e
    • Junio C Hamano's avatar
      Merge branch 'ds/rev-parse-required-args' into maint · c7b31732
      Junio C Hamano authored
      "git rev-parse" was loose in rejecting command line arguments that
      do not make sense, e.g. "--default" without the required value for
      that option.
      
      * ds/rev-parse-required-args:
        rev-parse: check i before using argv[i] against argc
      c7b31732
    • Junio C Hamano's avatar
      Merge branch 'jk/config-path-include-fix' into maint · 6f016677
      Junio C Hamano authored
      include.path variable (or any variable that expects a path that can
      use ~username expansion) in the configuration file is not a boolean,
      but the code failed to check it.
      
      * jk/config-path-include-fix:
        handle_path_include: don't look at NULL value
        expand_user_path: do not look at NULL path
      6f016677