1. 16 4月, 2018 1 次提交
    • N
      connect.c: mark die_initial_contact() NORETURN · d2bff22c
      Nguyễn Thái Ngọc Duy 提交于
      There is a series running in parallel with this one that adds code
      like this
      
          switch (...) {
          case ...:
              die_initial_contact();
          case ...:
      
      There is nothing wrong with this. There is no actual falling
      through. But since gcc is not that smart and gcc 7.x introduces
      -Wimplicit-fallthrough, it raises a false alarm in this case.
      
      This class of warnings may be useful elsewhere, so instead of
      suppressing the whole class, let's try to fix just this code. gcc is
      smart enough to realize that no execution can continue after a
      NORETURN function call and no longer raises the warning.
      Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com>
      Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      d2bff22c
  2. 23 3月, 2018 34 次提交
  3. 28 2月, 2018 4 次提交
    • J
      Merge branch 'ys/bisect-object-id-missing-conversion-fix' into maint · 38e79b1f
      Junio C Hamano 提交于
      Fix for a commented-out code to adjust it to a rather old API change.
      
      * ys/bisect-object-id-missing-conversion-fix:
        bisect: debug: convert struct object to object_id
      38e79b1f
    • J
      Merge branch 'sb/submodule-update-reset-fix' into maint · 14890e91
      Junio C Hamano 提交于
      When resetting the working tree files recursively, the working tree
      of submodules are now also reset to match.
      
      * sb/submodule-update-reset-fix:
        submodule: submodule_move_head omits old argument in forced case
        unpack-trees: oneway_merge to update submodules
        t/lib-submodule-update.sh: fix test ignoring ignored files in submodules
        t/lib-submodule-update.sh: clarify test
      14890e91
    • J
      Merge branch 'ab/commit-m-with-fixup' into maint · c1ab3b8a
      Junio C Hamano 提交于
      "git commit --fixup" did not allow "-m<message>" option to be used
      at the same time; allow it to annotate resulting commit with more
      text.
      
      * ab/commit-m-with-fixup:
        commit: add support for --fixup <commit> -m"<extra message>"
        commit doc: document that -c, -C, -F and --fixup with -m error
      c1ab3b8a
    • J
      Merge branch 'nd/ita-wt-renames-in-status' into maint · 12accdc0
      Junio C Hamano 提交于
      "git status" after moving a path in the working tree (hence making
      it appear "removed") and then adding with the -N option (hence
      making that appear "added") detected it as a rename, but did not
      report the  old and new pathnames correctly.
      
      * nd/ita-wt-renames-in-status:
        wt-status.c: handle worktree renames
        wt-status.c: rename rename-related fields in wt_status_change_data
        wt-status.c: catch unhandled diff status codes
        wt-status.c: coding style fix
        Use DIFF_DETECT_RENAME for detect_rename assignments
        t2203: test status output with porcelain v2 format
      12accdc0
  4. 23 2月, 2018 1 次提交