chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split brain: quiltify_trees_differ: document $ignorenamesr
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index b3071b71347d9dec2ae3c14d09e56e02cc92f07a..4f12594f6ade6f89f0d04d6efe16e61a8451e242 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-2521,6
+2521,8
@@
sub quiltify_trees_differ ($$;$) {
# with $finegrained,
# returns bitmask 01 - differ in upstream files except .gitignore
# 02 - differ in .gitignore
# with $finegrained,
# returns bitmask 01 - differ in upstream files except .gitignore
# 02 - differ in .gitignore
+ # if $ignorenamesr is defined, $ingorenamesr->{$fn}
+ # is set for each modified .gitignore filename $fn
local $/=undef;
my @cmd = (@git, qw(diff-tree --name-only -z));
push @cmd, qw(-r) if $finegrained;
local $/=undef;
my @cmd = (@git, qw(diff-tree --name-only -z));
push @cmd, qw(-r) if $finegrained;