1. 15 Feb, 2018 8 commits
    • Junio C Hamano's avatar
      Merge branch 'nd/add-i-ignore-submodules' into maint · 2409e103
      Junio C Hamano authored
      "git add -p" was taught to ignore local changes to submodules as
      they do not interfere with the partial addition of regular changes
      anyway.
      
      * nd/add-i-ignore-submodules:
        add--interactive: ignore submodule changes except HEAD
      2409e103
    • Junio C Hamano's avatar
      Merge branch 'tg/stash-with-pathspec-fix' into maint · 984c8337
      Junio C Hamano authored
      "git stash -- <pathspec>" incorrectly blew away untracked files in
      the directory that matched the pathspec, which has been corrected.
      
      * tg/stash-with-pathspec-fix:
        stash: don't delete untracked files that match pathspec
      984c8337
    • Junio C Hamano's avatar
      Merge branch 'jk/abort-clone-with-existing-dest' into maint · 1363914a
      Junio C Hamano authored
      "git clone $there $here" is allowed even when here directory exists
      as long as it is an empty directory, but the command incorrectly
      removed it upon a failure of the operation.
      
      * jk/abort-clone-with-existing-dest:
        clone: do not clean up directories we didn't create
        clone: factor out dir_exists() helper
        t5600: modernize style
        t5600: fix outdated comment about unborn HEAD
      1363914a
    • Junio C Hamano's avatar
      Merge branch 'jc/merge-symlink-ours-theirs' into maint · ff19620f
      Junio C Hamano authored
      "git merge -Xours/-Xtheirs" learned to use our/their version when
      resolving a conflicting updates to a symbolic link.
      
      * jc/merge-symlink-ours-theirs:
        merge: teach -Xours/-Xtheirs to symbolic link merge
      ff19620f
    • Junio C Hamano's avatar
      Merge branch 'rs/lose-leak-pending' into maint · e17cec27
      Junio C Hamano authored
      API clean-up around revision traversal.
      
      * rs/lose-leak-pending:
        commit: remove unused function clear_commit_marks_for_object_array()
        revision: remove the unused flag leak_pending
        checkout: avoid using the rev_info flag leak_pending
        bundle: avoid using the rev_info flag leak_pending
        bisect: avoid using the rev_info flag leak_pending
        object: add clear_commit_marks_all()
        ref-filter: use clear_commit_marks_many() in do_merge_filter()
        commit: use clear_commit_marks_many() in remove_redundant()
        commit: avoid allocation in clear_commit_marks_many()
      e17cec27
    • Junio C Hamano's avatar
      Merge branch 'jm/svn-pushmergeinfo-fix' into maint · 04afcc22
      Junio C Hamano authored
      "git svn dcommit" did not take into account the fact that a
      svn+ssh:// URL with a [email protected] (typically used for pushing) refers
      to the same SVN repository without the [email protected] and failed when
      svn.pushmergeinfo option is set.
      
      * jm/svn-pushmergeinfo-fix:
        git-svn: fix svn.pushmergeinfo handling of svn+ssh usernames.
      04afcc22
    • Junio C Hamano's avatar
      Merge branch 'dk/describe-all-output-fix' into maint · 468dc22e
      Junio C Hamano authored
      An old regression in "git describe --all $annotated_tag^0" has been
      fixed.
      
      * dk/describe-all-output-fix:
        describe: prepend "tags/" when describing tags with embedded name
      468dc22e
    • Junio C Hamano's avatar
      Merge branch 'ab/perf-grep-threads' into maint · af38deeb
      Junio C Hamano authored
      More perf tests for threaded grep
      
      * ab/perf-grep-threads:
        perf: amend the grep tests to test grep.threads
      af38deeb
  2. 22 Jan, 2018 3 commits
  3. 19 Jan, 2018 1 commit
    • brian m. carlson's avatar
      repository: pre-initialize hash algo pointer · e26f7f19
      brian m. carlson authored
      There are various git subcommands (among them, clone) which don't set up
      the repository (that is, they lack RUN_SETUP or RUN_SETUP_GENTLY) but
      end up needing to have information about the hash algorithm in use.
      Because the hash algorithm is part of struct repository and it's only
      initialized in repository setup, we can end up dereferencing a NULL
      pointer in some cases if we call one of these subcommands and look up
      the empty blob or empty tree values.
      
      A "git clone" of a project that has two paths that differ only in
      case suffers from this if it is run on a case insensitive platform.
      When the command attempts to check out one of these two paths after
      checking out the other one, the checkout codepath needs to see if
      the version that is already on the filesystem (which should not
      happen if the FS were case sensitive) is dirty, and it needs to
      exercise the hashing code at that point.
      
      In the future, we can add a command line option for this or read it
      from the configuration, but until we're ready to expose that
      functionality to the user, simply initialize the repository
      structure to use the current hash algorithm, SHA-1.
      Signed-off-by: brian m. carlson's avatarbrian m. carlson <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      e26f7f19
  4. 17 Jan, 2018 1 commit
  5. 16 Jan, 2018 2 commits
    • Junio C Hamano's avatar
      Merge tag 'l10n-2.16.0-rnd2' of git://github.com/git-l10n/git-po · e0d57502
      Junio C Hamano authored
      l10n for Git 2.16.0 round 2
      
      * tag 'l10n-2.16.0-rnd2' of git://github.com/git-l10n/git-po: (24 commits)
        l10n: de.po: translate 72 new messages
        l10n: de.po: improve messages when a branch starts to track another ref
        l10n: bg.po: Updated Bulgarian translation (3288t)
        l10n: TEAMS: add zh_CN team members
        l10n: zh_CN: for git v2.16.0 l10n round 2
        l10n: sv.po: Update Swedish translation (3288t0f0u)
        l10n: ru.po: update Russian translation
        l10n: TEAMS: Add ko team members
        l10n: ko.po: Update Korean translation
        l10n: fr.po 2.16 round 2
        l10n: es.po: Spanish translation 2.16.0 round 2
        l10n: vi.po(3288t): Updated Vietnamese translation for v2.16.0 round 2
        l10n: git.pot: v2.16.0 round 2 (8 new, 4 removed)
        l10n: es.po: Update Spanish Translation v2.16.0
        l10n: fr.po v2.16.0 round 1
        l10n: bg.po: Updated Bulgarian translation (3284t)
        l10n: sv.po: Update Swedish translation (3284t0f0u)
        l10n: fr.po: "worktree list" mistranslated as prune
        l10n: git.pot: v2.16.0 round 1 (64 new, 25 removed)
        l10n: fixes to German translation
        ...
      e0d57502
    • Duy Nguyen's avatar
      add--interactive: ignore submodule changes except HEAD · 12434efc
      Duy Nguyen authored
      For 'add -i' and 'add -p', the only action we can take on a dirty
      submodule entry is update the index with a new value from its HEAD. The
      content changes inside (from its own index, untracked files...) do not
      matter, at least until 'git add -i' learns about launching a new
      interactive add session inside a submodule.
      
      Ignore all other submodules changes except HEAD. This reduces the number
      of entries the user has to check through in 'git add -i', and the number
      of 'no' they have to answer to 'git add -p' when dirty submodules are
      present.
      Signed-off-by: Duy Nguyen's avatarNguyễn Thái Ngọc Duy <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      12434efc
  6. 15 Jan, 2018 2 commits
  7. 12 Jan, 2018 1 commit
  8. 11 Jan, 2018 6 commits
  9. 10 Jan, 2018 11 commits
  10. 09 Jan, 2018 5 commits