Skip to content

Commit

Permalink
scripts/kernel_upgrade: fix workaround for merge/restore commit creation
Browse files Browse the repository at this point in the history
Return part of the original design.  Issue is at some future time,
it could be possible for a versioned file to be created inside a
versioned directory.  Presently there are no cases of
"dir-<version>/file-<version>", but it seems best to be prepared for
this.

Alas, this points out `git fast-import` isn't really a proper binary
protocol.  There really needs to be a -0 option to allow arbitrary
filenames.

Signed-off-by: Elliott Mitchell <ehem+openwrt@m5p.com>
  • Loading branch information
ehem committed Apr 6, 2024
1 parent 9326020 commit 62f5016
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/kernel_upgrade.pl
Expand Up @@ -288,7 +288,7 @@ ()

foreach my $name (@$list) {
next if($git->ls($start, "$name$to"));
my $new=$git->ls($start, "$name$from");
my $new=$git->ls('', "\"$name$from\"");
$git->putcmd("M $new->[0] $new->[1] $name$to");
$git->putcmd("D $name$from");
}
Expand Down

0 comments on commit 62f5016

Please sign in to comment.