Re: oops

Re: oops

[Noah Friedman]

>I fat-fingered "git push --all" (bad habit from work) when pushing a single
>change I made on the emacs-25 branch, and I fear I may have restored some
>branch tags that had been renamed or deleted upstream.  Many apologies.

Ok, actually as far as I can tell no branches were modified, but the server
generated a whole slew of diffs for changes that were already there, and I
don't understand why.  Apologies still.

Re: oops

[Stefan Monnier]

> Ok, actually as far as I can tell no branches were modified, but the server
> generated a whole slew of diffs for changes that were already there, and I
> don't understand why.  Apologies still.

Maybe no branch was modified, but many branches were (re)created:

    + git pull
    remote: Counting objects: 8417, done.
    remote: Compressing objects: 100% (380/380), done.
    remote: Total 1145 (delta 877), reused 1022 (delta 764)
    Réception d'objets: 100% (1145/1145), 321.10 KiB | 294.00 KiB/s, fait.
    Résolution des deltas: 100% (877/877), complété avec 170 objets locaux.
    Depuis git+ssh://git.sv.gnu.org/srv/git/emacs
       52f7440b8e..5e2cf8c804  master                -> origin/master
     * [nouvelle branche]      cairo                 -> origin/cairo
     * [nouvelle branche]      concurrency           -> origin/concurrency
     * [nouvelle branche]      dynamic-modules       -> origin/dynamic-modules
     * [nouvelle branche]      dynamic-modules-rc2   -> origin/dynamic-modules-rc2
       784602b105..c0d42853cd  emacs-25              -> origin/emacs-25
     * [nouvelle branche]      emacs-25-merge        -> origin/emacs-25-merge
     * [nouvelle branche]      feature/aptel/dynamic-modules-rc3 -> origin/feature/aptel/dynamic-modules-rc3
     * [nouvelle branche]      feature/documentation-for-auto-undo -> origin/feature/documentation-for-auto-undo
       7c3595470d..28f6e8a04b  feature/gnus-select   -> origin/feature/gnus-select
     * [nouvelle branche]      feature/manual-ldefs-rebased -> origin/feature/manual-ldefs-rebased
     * [nouvelle branche]      feature/standard-test-location -> origin/feature/standard-test-location
     * [nouvelle branche]      feature/tests-depend-on-source -> origin/feature/tests-depend-on-source
     * [nouvelle branche]      fix/no-undo-boundary-on-secondary-buffer-change -> origin/fix/no-undo-boundary-on-secondary-buffer-change
     * [nouvelle branche]      fix/segfault-from-run-undoable-change -> origin/fix/segfault-from-run-undoable-change
     * [nouvelle branche]      fix/segfault-undoable-change-prepare-for-buffer -> origin/fix/segfault-undoable-change-prepare-for-buffer
     * [nouvelle branche]      fix/subst-char-in-region -> origin/fix/subst-char-in-region
     * [nouvelle branche]      fix/undo-point-in-wrong-place -> origin/fix/undo-point-in-wrong-place
     * [nouvelle branche]      fix/viper-undo        -> origin/fix/viper-undo
     * [nouvelle branche]      fix/viper-undo-squash -> origin/fix/viper-undo-squash
     * [nouvelle branche]      map                   -> origin/map
     * [nouvelle branche]      nsm                   -> origin/nsm
     * [nouvelle branche]      other-branches/glibc-2_0_x -> origin/other-branches/glibc-2_0_x
     * [nouvelle branche]      other-branches/thomas-posix1996 -> origin/other-branches/thomas-posix1996
     * [nouvelle branche]      scratch/calancha-revert-2c8a7e5 -> origin/scratch/calancha-revert-2c8a7e5
     * [nouvelle branche]      scratch/check-declare -> origin/scratch/check-declare
     * [nouvelle branche]      scratch/face-realization -> origin/scratch/face-realization
     * [nouvelle branche]      scratch/gnus-cloud    -> origin/scratch/gnus-cloud
     * [nouvelle branche]      scratch/install-package-from-directory -> origin/scratch/install-package-from-directory
     * [nouvelle branche]      scratch/isearch-character-group-folding -> origin/scratch/isearch-character-group-folding
     * [nouvelle branche]      scratch/outline       -> origin/scratch/outline
     * [nouvelle branche]      scratch/outline-nowhitespace -> origin/scratch/outline-nowhitespace
     * [nouvelle branche]      scratch/package-fix   -> origin/scratch/package-fix
     * [nouvelle branche]      scratch/package.el-async-refresh -> origin/scratch/package.el-async-refresh
     + 45267fc81a...390612eb7a scratch/record        -> origin/scratch/record  (mise à jour forcée)
     * [nouvelle branche]      seq-let               -> origin/seq-let
    Mise à jour 52f7440b8e..5e2cf8c804
    Fast-forward
     lib/intprops.h                 | 20 +---------
     lib/utimens.c                  | 18 +++++++--
     lisp/net/tramp-adb.el          |  2 +
     lisp/net/tramp-cmds.el         |  8 ++--
     lisp/net/tramp-compat.el       |  5 +--
     lisp/net/tramp-gvfs.el         |  9 ++---
     lisp/net/tramp-sh.el           |  6 +--
     lisp/net/tramp-smb.el          |  6 +--
     lisp/net/tramp.el              | 28 +++++++++++--
     lisp/progmodes/verilog-mode.el | 91 +++++++++++++++++++++++++++++++-----------
     test/lisp/filenotify-tests.el  |  9 +++--
     test/lisp/net/tramp-tests.el   | 54 ++++++++++++++++++++++++-
     12 files changed, 177 insertions(+), 79 deletions(-)

where "nouvelle branche" means "new branch".
Could you try and fix those?


        Stefan