1. 28 Aug, 2019 3 commits
    • Duy Nguyen's avatar
      5e3b0120
    • Duy Nguyen's avatar
      rm: add --staged as alias for --cached · 89c837b6
      Duy Nguyen authored
      After the last patch, "git status" now suggests
      
      - add                  to stage some changes
      - restore [--worktree] to undo worktree changes
      - restore --staged     to undo index changes
      - rm --cached          to remove files from the index
      
      This change is to make the suggestions for more consistent by using
      --staged across all suggested commands instead of the
      still-a-bit-hard-to-understand --cached.
      
      PS. Should we suggest "git stage" instead of "git add"? Maybe that's
      going too far?
      89c837b6
    • Duy Nguyen's avatar
      restore: add --intent-to-add (restoring worktree only) · e973f601
      Duy Nguyen authored
      "git restore --source" (without --staged) could create new files
      (i.e. not present in index) on worktree to match the given source. But
      the new files are not tracked, so both "git diff" and "git diff
      <source>" ignore new files. "git commit -a" will not recreate a commit
      exactly as the given source either.
      
      Add --intent-to-add to help track new files in this case, which is the
      default on the least surprise principle.
      e973f601
  2. 22 Aug, 2019 13 commits
    • Junio C Hamano's avatar
      First batch after Git 2.23 · 745f6812
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      745f6812
    • Junio C Hamano's avatar
      Merge branch 'sg/worktree-remove-errormsg' · d4b12b9e
      Junio C Hamano authored
      Error message update/clarification.
      
      * sg/worktree-remove-errormsg:
        worktree remove: clarify error message on dirty worktree
      d4b12b9e
    • Junio C Hamano's avatar
      Merge branch 'en/fast-import-merge-doc' · 22e86e85
      Junio C Hamano authored
      Doc update.
      
      * en/fast-import-merge-doc:
        git-fast-import.txt: clarify that multiple merge commits are allowed
      22e86e85
    • Junio C Hamano's avatar
      Merge branch 'jk/perf-no-dups' · 9c757358
      Junio C Hamano authored
      Test & perf scripts must use unique numeric prefix, but a pair
      shared the same number, which is fixed here.
      
      * jk/perf-no-dups:
        t/perf: rename duplicate-numbered test script
      9c757358
    • Junio C Hamano's avatar
      Merge branch 'rs/nedalloc-fixlets' · 4336fdb2
      Junio C Hamano authored
      Compilation fix.
      
      * rs/nedalloc-fixlets:
        nedmalloc: avoid compiler warning about unused value
        nedmalloc: do assignments only after the declaration section
      4336fdb2
    • Junio C Hamano's avatar
      Merge branch 'sg/show-failed-test-names' · 8ae7a46c
      Junio C Hamano authored
      The first line of verbose output from each test piece now carries
      the test name and number to help scanning with eyeballs.
      
      * sg/show-failed-test-names:
        tests: show the test name and number at the start of verbose output
        t0000-basic: use realistic test script names in the verbose tests
      8ae7a46c
    • Junio C Hamano's avatar
      Merge branch 'sg/commit-graph-validate' · 6ba06b58
      Junio C Hamano authored
      The code to write commit-graph over given commit object names has
      been made a bit more robust.
      
      * sg/commit-graph-validate:
        commit-graph: error out on invalid commit oids in 'write --stdin-commits'
        commit-graph: turn a group of write-related macro flags into an enum
        t5318-commit-graph: use 'test_expect_code'
      6ba06b58
    • Junio C Hamano's avatar
      Merge branch 'vn/restore-empty-ita-corner-case-fix' · 072735ea
      Junio C Hamano authored
      "git checkout" and "git restore" to re-populate the index from a
      tree-ish (typically HEAD) did not work correctly for a path that
      was removed and then added again with the intent-to-add bit, when
      the corresponding working tree file was empty.  This has been
      corrected.
      
      * vn/restore-empty-ita-corner-case-fix:
        restore: add test for deleted ita files
        checkout.c: unstage empty deleted ita files
      072735ea
    • Junio C Hamano's avatar
      Merge branch 'sc/pack-refs-deletion-racefix' · 207ad3cb
      Junio C Hamano authored
      "git pack-refs" can lose refs that are created while running, which
      is getting corrected.
      
      * sc/pack-refs-deletion-racefix:
        pack-refs: always refresh after taking the lock file
      207ad3cb
    • Junio C Hamano's avatar
      Merge branch 'sg/do-not-skip-non-httpd-tests' · 77067b6c
      Junio C Hamano authored
      Test fix.
      
      * sg/do-not-skip-non-httpd-tests:
        t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd'
        t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh'
        t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh'
      77067b6c
    • Junio C Hamano's avatar
      Merge branch 'jk/tree-walk-overflow' · 1b01cdbf
      Junio C Hamano authored
      Codepaths to walk tree objects have been audited for integer
      overflows and hardened.
      
      * jk/tree-walk-overflow:
        tree-walk: harden make_traverse_path() length computations
        tree-walk: add a strbuf wrapper for make_traverse_path()
        tree-walk: accept a raw length for traverse_path_len()
        tree-walk: use size_t consistently
        tree-walk: drop oid from traverse_info
        setup_traverse_info(): stop copying oid
      1b01cdbf
    • Junio C Hamano's avatar
      Merge branch 'sg/t5510-test-i18ngrep-fix' · 8aa76abb
      Junio C Hamano authored
      Test fix.
      
      * sg/t5510-test-i18ngrep-fix:
        t5510-fetch: fix negated 'test_i18ngrep' invocation
      8aa76abb
    • Junio C Hamano's avatar
      Merge branch 'mt/grep-submodules-working-tree' · 30717973
      Junio C Hamano authored
      "git grep --recurse-submodules" that looks at the working tree
      files looked at the contents in the index in submodules, instead of
      files in the working tree.
      
      * mt/grep-submodules-working-tree:
        grep: fix worktree case in submodules
      30717973
  3. 16 Aug, 2019 3 commits
  4. 13 Aug, 2019 1 commit
    • Gábor Szeder's avatar
      worktree remove: clarify error message on dirty worktree · 507e5470
      Gábor Szeder authored
      To avoid data loss, 'git worktree remove' refuses to delete a worktree
      if it's dirty or contains untracked files.  However, the error message
      only mentions that the worktree "is dirty", even if the worktree in
      question is in fact clean, but contains untracked files:
      
        $ git worktree add test-worktree
        Preparing worktree (new branch 'test-worktree')
        HEAD is now at aa53e60 Initial
        $ >test-worktree/untracked-file
        $ git worktree remove test-worktree/
        fatal: 'test-worktree/' is dirty, use --force to delete it
        $ git -C test-worktree/ diff
        $ git -C test-worktree/ diff --cached
        $ # Huh?  Where are those dirty files?!
      
      Clarify this error message to say that the worktree "contains modified
      or untracked files".
      Signed-off-by: Gábor Szeder's avatarSZEDER Gábor <szeder.dev@gmail.com>
      Reviewed-by: Eric Sunshine's avatarEric Sunshine <sunshine@sunshineco.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      507e5470
  5. 12 Aug, 2019 8 commits
  6. 11 Aug, 2019 4 commits
  7. 10 Aug, 2019 5 commits
  8. 09 Aug, 2019 3 commits