1. 06 May, 2018 3 commits
    • Johannes Schindelin's avatar
      Replace all die("BUG: ...") calls by BUG() ones · 033abf97
      Johannes Schindelin authored
      In d8193743 (usage.c: add BUG() function, 2017-05-12), a new macro
      was introduced to use for reporting bugs instead of die(). It was then
      subsequently used to convert one single caller in 588a538a
      (setup_git_env: convert die("BUG") to BUG(), 2017-05-12).
      
      The cover letter of the patch series containing this patch
      (cf 20170513032414.mfrwabt4hovujde2@sigill.intra.peff.net) is not
      terribly clear why only one call site was converted, or what the plan
      is for other, similar calls to die() to report bugs.
      
      Let's just convert all remaining ones in one fell swoop.
      
      This trick was performed by this invocation:
      
      	sed -i 's/die("BUG: /BUG("/g' $(git grep -l 'die("BUG' \*.c)
      Signed-off-by: Johannes Schindelin's avatarJohannes Schindelin <johannes.schindelin@gmx.de>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      033abf97
    • Johannes Schindelin's avatar
      run-command: use BUG() to report bugs, not die() · dde74d73
      Johannes Schindelin authored
      The slightly misleading name die_bug() of the function intended to
      report a bug is actually called always, and only reports a bug if the
      passed-in parameter `err` is non-zero.
      
      It uses die_errno() to report the bug, to helpfully include the error
      message corresponding to `err`.
      
      However, as these messages indicate bugs, we really should use BUG().
      And as BUG() is a macro to be able to report the exact file and line
      number, we need to convert die_bug() to a macro instead of only
      replacing the die_errno() by a call to BUG().
      
      While at it, use a name more indicative of the purpose: CHECK_BUG().
      Signed-off-by: Johannes Schindelin's avatarJohannes Schindelin <johannes.schindelin@gmx.de>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      dde74d73
    • Johannes Schindelin's avatar
      test-tool: help verifying BUG() code paths · a86303cb
      Johannes Schindelin authored
      When we call BUG(), we signal via SIGABRT that something bad happened,
      dumping cores if so configured. In some setups these coredumps are
      redirected to some central place such as /proc/sys/kernel/core_pattern,
      which is a good thing.
      
      However, when we try to verify in our test suite that bugs are caught in
      certain code paths, we do *not* want to clutter such a central place
      with unnecessary coredumps.
      
      So let's special-case the test helpers (which we use to verify such code
      paths) so that the BUG() calls will *not* call abort() but exit with a
      special-purpose exit code instead.
      Helped-by: Duy Nguyen's avatarNguyễn Thái Ngọc Duy <pclouds@gmail.com>
      Signed-off-by: Johannes Schindelin's avatarJohannes Schindelin <johannes.schindelin@gmx.de>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      a86303cb
  2. 25 Apr, 2018 29 commits
    • Junio C Hamano's avatar
      The fourth batch for 2.18 · 1f1cddd5
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      1f1cddd5
    • Junio C Hamano's avatar
      Merge branch 'jm/mem-pool' · cac7a2ba
      Junio C Hamano authored
      An reusable "memory pool" implementation has been extracted from
      fast-import.c, which in turn has become the first user of the
      mem-pool API.
      
      * jm/mem-pool:
        mem-pool: move reusable parts of memory pool into its own file
        fast-import: introduce mem_pool type
        fast-import: rename mem_pool type to mp_block
      cac7a2ba
    • Junio C Hamano's avatar
      Merge branch 'tg/use-git-contacts' · bedb10c7
      Junio C Hamano authored
      Doc update.
      
      * tg/use-git-contacts:
        SubmittingPatches: mention the git contacts command
      bedb10c7
    • Junio C Hamano's avatar
      Merge branch 'sb/filenames-with-dashes' · 89e5aa3d
      Junio C Hamano authored
      Rename bunch of source files to more consistently use dashes
      instead of underscores to connect words.
      
      * sb/filenames-with-dashes:
        replace_object.c: rename to use dash in file name
        sha1_file.c: rename to use dash in file name
        sha1_name.c: rename to use dash in file name
        exec_cmd: rename to use dash in file name
        unicode_width.h: rename to use dash in file name
        write_or_die.c: rename to use dashes in file name
      89e5aa3d
    • Junio C Hamano's avatar
      Merge branch 'cc/perf-bisect' · 02645318
      Junio C Hamano authored
      Performance measuring framework in t/perf learned to help bisecting
      performance regressions.
      
      * cc/perf-bisect:
        t/perf: add scripts to bisect performance regressions
        perf/run: add --subsection option
      02645318
    • Junio C Hamano's avatar
      Merge branch 'bp/fsmonitor-prime-index' · 7a79d7e9
      Junio C Hamano authored
      The index file is updated to record the fsmonitor section after a
      full scan was made, to avoid wasting the effort that has already
      spent.
      
      * bp/fsmonitor-prime-index:
        fsmonitor: force index write after full scan
      7a79d7e9
    • Junio C Hamano's avatar
      Merge branch 'bp/fsmonitor-bufsize-fix' · beed7e22
      Junio C Hamano authored
      Fix an unexploitable (because the oversized contents are not under
      attacker's control) buffer overflow.
      
      * bp/fsmonitor-bufsize-fix:
        fsmonitor: fix incorrect buffer size when printing version number
      beed7e22
    • Junio C Hamano's avatar
      Merge branch 'cb/bash-completion-ls-files-processing' · 3a940e90
      Junio C Hamano authored
      Shell completion (in contrib) that gives list of paths have been
      optimized somewhat.
      
      * cb/bash-completion-ls-files-processing:
        completion: improve ls-files filter performance
      3a940e90
    • Junio C Hamano's avatar
      Merge branch 'es/worktree-docs' · 6b747fc7
      Junio C Hamano authored
      Doc updates.
      
      * es/worktree-docs:
        git-worktree.txt: unify command-line prompt in example blocks
        git-worktree.txt: recommend 'git worktree remove' over manual deletion
      6b747fc7
    • Junio C Hamano's avatar
      Merge branch 'es/fread-reads-dir-autoconf-fix' · 8b22d132
      Junio C Hamano authored
      Small fix to the autoconf build procedure.
      
      * es/fread-reads-dir-autoconf-fix:
        configure.ac: fix botched FREAD_READS_DIRECTORIES check
      8b22d132
    • Junio C Hamano's avatar
      Merge branch 'ps/test-chmtime-get' · deb9845a
      Junio C Hamano authored
      Test cleanup.
      
      * ps/test-chmtime-get:
        t/helper: 'test-chmtime (--get|-g)' to print only the mtime
      deb9845a
    • Junio C Hamano's avatar
      Merge branch 'js/t5404-path-fix' · 3d5a179e
      Junio C Hamano authored
      Test fix.
      
      * js/t5404-path-fix:
        t5404: relax overzealous test
      3d5a179e
    • Junio C Hamano's avatar
      Merge branch 'jk/ref-array-push' · b3d6c48c
      Junio C Hamano authored
      API clean-up aournd ref-filter code.
      
      * jk/ref-array-push:
        ref-filter: factor ref_array pushing into its own function
        ref-filter: make ref_array_item allocation more consistent
        ref-filter: use "struct object_id" consistently
      b3d6c48c
    • Junio C Hamano's avatar
      Merge branch 'en/doc-typoes' · cb6462fe
      Junio C Hamano authored
      Docfix.
      
      * en/doc-typoes:
        Documentation: normalize spelling of 'normalised'
        Documentation: fix several one-character-off spelling errors
      cb6462fe
    • Junio C Hamano's avatar
      Merge branch 'lw/daemon-log-destination' · f9bcd751
      Junio C Hamano authored
      Recent introduction of "--log-destination" option to "git daemon"
      did not work well when the daemon was run under "--inetd" mode.
      
      * lw/daemon-log-destination:
        daemon.c: fix condition for redirecting stderr
      f9bcd751
    • Junio C Hamano's avatar
      Merge branch 'mn/send-email-credential-doc' · f8fbcd6e
      Junio C Hamano authored
      Doc update.
      
      * mn/send-email-credential-doc:
        send-email: simplify Gmail example in the documentation
      f8fbcd6e
    • Junio C Hamano's avatar
      Merge branch 'ak/bisect-doc-typofix' · f2d5e076
      Junio C Hamano authored
      Docfix.
      
      * ak/bisect-doc-typofix:
        Documentation/git-bisect.txt: git bisect term → git bisect terms
      f2d5e076
    • Junio C Hamano's avatar
      Merge branch 'br/mergetools-guiffy' · da36be5f
      Junio C Hamano authored
      "git mergetools" learned talking to guiffy.
      
      * br/mergetools-guiffy:
        mergetools: add support for guiffy
      da36be5f
    • Junio C Hamano's avatar
      Merge branch 'nd/worktree-move' · 03f78e14
      Junio C Hamano authored
      Test update.
      
      * nd/worktree-move:
        t2028: tighten grep expression to make "move worktree" test more robust
      03f78e14
    • Junio C Hamano's avatar
      Merge branch 'ks/branch-list-detached-rebase-i' · 4cbaa6b4
      Junio C Hamano authored
      "git branch --list" during an interrupted "rebase -i" now lets
      users distinguish the case where a detached HEAD is being rebased
      and a normal branch is being rebased.
      
      * ks/branch-list-detached-rebase-i:
        t3200: verify "branch --list" sanity when rebasing from detached HEAD
        branch --list: print useful info whilst interactive rebasing a detached HEAD
      4cbaa6b4
    • Junio C Hamano's avatar
      Merge branch 'jk/t5561-missing-curl' · e6986abb
      Junio C Hamano authored
      Test fixes.
      
      * jk/t5561-missing-curl:
        t5561: skip tests if curl is not available
        t5561: drop curl stderr redirects
      e6986abb
    • Junio C Hamano's avatar
      Merge branch 'bw/commit-partial-from-subdirectory-fix' · 8295f202
      Junio C Hamano authored
      "cd sub/dir && git commit ../path" ought to record the changes to
      the file "sub/path", but this regressed long time ago.
      
      * bw/commit-partial-from-subdirectory-fix:
        commit: allow partial commits with relative paths
      8295f202
    • Junio C Hamano's avatar
      Merge branch 'jk/relative-directory-fix' · ff6eb825
      Junio C Hamano authored
      Some codepaths, including the refs API, get and keep relative
      paths, that go out of sync when the process does chdir(2).  The
      chdir-notify API is introduced to let these codepaths adjust these
      cached paths to the new current directory.
      
      * jk/relative-directory-fix:
        refs: use chdir_notify to update cached relative paths
        set_work_tree: use chdir_notify
        add chdir-notify API
        trace.c: export trace_setup_key
        set_git_dir: die when setenv() fails
      ff6eb825
    • Junio C Hamano's avatar
      Merge branch 'jk/flockfile-stdio' · 5d8da91e
      Junio C Hamano authored
      Code clean-up.
      
      * jk/flockfile-stdio:
        config: move flockfile() closer to unlocked functions
      5d8da91e
    • Junio C Hamano's avatar
      Merge branch 'pw/rebase-signoff' · 850e9257
      Junio C Hamano authored
      "git rebase" has learned to honor "--signoff" option when using
      backends other than "am" (but not "--preserve-merges").
      
      * pw/rebase-signoff:
        rebase --keep-empty: always use interactive rebase
        rebase -p: error out if --signoff is given
        rebase: extend --signoff support
      850e9257
    • Junio C Hamano's avatar
      Merge branch 'pw/rebase-keep-empty-fixes' · d892beef
      Junio C Hamano authored
      "git rebase --keep-empty" still removed an empty commit if the
      other side contained an empty commit (due to the "does an
      equivalent patch exist already?" check), which has been corrected.
      
      * pw/rebase-keep-empty-fixes:
        rebase: respect --no-keep-empty
        rebase -i --keep-empty: don't prune empty commits
        rebase --root: stop assuming squash_onto is unset
      d892beef
    • Junio C Hamano's avatar
      Merge branch 'cb/git-gui-ttk-style' · 18a6a857
      Junio C Hamano authored
      "git gui" has been taught to work with old versions of tk (like
      8.5.7) that do not support "ttk::style theme use" as a way to query
      the current theme.
      
      * cb/git-gui-ttk-style:
        git-gui: workaround ttk:style theme use
      18a6a857
    • Junio C Hamano's avatar
      Merge branch 'bp/git-gui-bind-kp-enter' · b1218e46
      Junio C Hamano authored
      "git gui" performs commit upon CTRL/CMD+ENTER but the
      CTRL/CMD+KP_ENTER (i.e. enter key on the numpad) did not have the
      same key binding.  It now does.
      
      * bp/git-gui-bind-kp-enter:
        git-gui: bind CTRL/CMD+numpad ENTER to do_commit
      b1218e46
    • Junio C Hamano's avatar
      Merge branch 'bb/git-gui-ssh-key-files' · 8b096114
      Junio C Hamano authored
      "git gui" learned that "~/.ssh/id_ecdsa.pub" and
      "~/.ssh/id_ed25519.pub" are also possible SSH key files.
      
      * bb/git-gui-ssh-key-files:
        git-gui: search for all current SSH key types
      8b096114
  3. 12 Apr, 2018 4 commits
  4. 11 Apr, 2018 4 commits