From: Christian Weisgerber Subject: Re: got send failure To: gameoftrees@openbsd.org Date: Sun, 29 Aug 2021 00:15:57 +0200 Stefan Sperling: > Most likely the file contents weren't included in the pack properly. > This would cause their hashes to change. > > I've attached the files I found in the pack file. > Can you please diff them against your files? That is... bizarre. Somehow parts were overwritten by a piece of commit.sh. --- histedit.sh Sun Aug 29 05:00:57 2021 +++ /home/naddy/histedit.sh Sun Aug 29 12:06:29 2021 @@ -116,7 +116,7 @@ return 1 fi - (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout) + chmod -x $testroot/wt/allog -l3 | grep ^commit > $testroot/stdout) echo "commit $new_commit2 (master)" > $testroot/stdout.expected echo "commit $new_commit1" >> $testroot/stdout.expected echo "commit $orig_commit" >> $testroot/stdout.expected @@ -304,7 +304,7 @@ return 1 fi - (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout) + chmod -x $testroot/wt/allog -l3 | grep ^commit > $testroot/stdout) echo "commit $new_commit1 (master)" > $testroot/stdout.expected echo "commit $new_commit2" >> $testroot/stdout.expected echo "commit $orig_commit" >> $testroot/stdout.expected @@ -537,7 +537,7 @@ return 1 fi - (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout) + chmod -x $testroot/wt/allog -l3 | grep ^commit > $testroot/stdout) echo "commit $new_commit2 (master)" > $testroot/stdout.expected echo "commit $orig_commit" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout @@ -681,7 +681,7 @@ return 1 fi - (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout) + chmod -x $testroot/wt/allog -l3 | grep ^commit > $testroot/stdout) echo "commit $new_commit2 (master)" > $testroot/stdout.expected echo "commit $new_commit1" >> $testroot/stdout.expected echo "commit $orig_commit" >> $testroot/stdout.expected @@ -1615,7 +1615,7 @@ return 1 fi - (cd $testroot/wt && got log | grep ^commit > $testroot/stdout) + chmod -x $testroot/wt/allog | grep ^commit > $testroot/stdout) echo "commit $new_commit1 (master)" > $testroot/stdout.expected echo "commit $orig_commit" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout @@ -1733,7 +1733,7 @@ return 1 fi - (cd $testroot/wt && got log | grep ^commit > $testroot/stdout) + chmod -x $testroot/wt/allog | grep ^commit > $testroot/stdout) echo "commit $new_commit1 (master)" > $testroot/stdout.expected echo "commit $orig_commit" >> $testroot/stdout.expected cmp -s $testroot/stdout.expected $testroot/stdout --- rebase.sh Sun Aug 29 05:00:57 2021 +++ /home/naddy/rebase.sh Sun Aug 29 12:06:29 2021 @@ -128,7 +128,7 @@ return 1 fi - (cd $testroot/wt && got log -l3 | grep ^commit > $testroot/stdout) + chmod -x $testroot/wt/allog -l3 | grep ^commit > $testroot/stdout) echo "commit $new_commit2 (newbranch)" > $testroot/stdout.expected echo "commit $new_commit1" >> $testroot/stdout.expected echo "commit $master_commit (master)" >> $testroot/stdout.expected -- Christian "naddy" Weisgerber naddy@mips.inka.de