urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only_committed_changes could fail in a git repository merged with git merge -s ours.

master
Joey Hess 2014-04-05 19:09:05 -04:00
parent 9989114c1f
commit 59cfb9b6d0
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
IkiWiki/Plugin/git.pm
View File

@ -467,6 +467,11 @@ sub git_commit_info ($;$) {
sub rcs_find_changes ($) {
my $oldrev=shift;
# Note that git log will sometimes show files being added that
# don't exist. Particularly, git merge -s ours can result in a
# merge commit where some files were not really added.
# This is why the code below verifies that the files really
# exist.
my @raw_lines = run_or_die('git', 'log',
'--pretty=raw', '--raw', '--abbrev=40', '--always', '-c',
'--no-renames', , '--reverse',
@ -482,12 +487,16 @@ sub rcs_find_changes ($) {
foreach my $i (@{$ci->{details}}) {
my $file=$i->{file};
if ($i->{sha1_to} eq $nullsha) {
delete $changed{$file};
$deleted{$file}=1;
if (! -e "$config{srcdir}/$file") {
delete $changed{$file};
$deleted{$file}=1;
}
}
else {
delete $deleted{$file};
$changed{$file}=1;
if (-e "$config{srcdir}/$file") {
delete $deleted{$file};
$changed{$file}=1;
}
}
}
}

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
ikiwiki (3.20140228) UNRELEASED; urgency=medium
* only_committed_changes could fail in a git repository merged
with git merge -s ours.
-- Joey Hess <joeyh@debian.org> Sat, 05 Apr 2014 19:08:22 -0400
ikiwiki (3.20140227) unstable; urgency=medium
* Added useragent config setting. Closes: #737121