Download raw body.
rebase suffers '?' conflicts
On Wed, Apr 12, 2023 at 11:33:42PM +0200, Christian Weisgerber wrote: > Stefan Sperling: > > > Two diffs below: > > update the base commit ID of unmodified files if the blob ID matches > > fix rebase/histedit -a leaving some files on the temporary branch > > There is another oddity. After aborting the rebase, there are > now modified file modes: > > #!/bin/sh -x > git clone --bare https://github.com/openbsd/src.git > cd src.git > git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*' > git remote add jca https://github.com/jcourreges/openbsd-src.git > git fetch --all > cd .. > got co src.git > cd src > got br tmp > got br -c jca/llvm15-12 llvm15 > got up -b tmp > got rb llvm15 > got rb -a > got st Seems like these files have an x-bit set in src.git and lose it after rebase -a, right? This will also need test coverage... > m gnu/llvm/clang/include/clang/AST/DeclTemplate.h > m gnu/llvm/clang/lib/AST/DeclTemplate.cpp > m gnu/llvm/clang/lib/Sema/SemaConcept.cpp > m gnu/llvm/clang/lib/Sema/SemaTemplate.cpp > m gnu/llvm/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp > m gnu/llvm/clang/utils/analyzer/CmpRuns.py > m gnu/llvm/clang/utils/analyzer/SATestBuild.py > > -- > Christian "naddy" Weisgerber naddy@mips.inka.de > >
rebase suffers '?' conflicts