chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
61b51ad
)
Split brain: quiltify_trees_differ: Improve doc comment
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 4 Jun 2016 11:58:32 +0000
(12:58 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 15:47:47 +0000
(16:47 +0100)
dgit
patch
|
blob
|
history
diff --git
a/dgit
b/dgit
index 4ac5748b15f2cf8a45dec2d095a2436b40a92a53..3e4741f74a48ebbc7219cbb0505ccdf1d78523fa 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-2513,8
+2513,9
@@
END
sub quiltify_trees_differ ($$;$) {
my ($x,$y,$finegrained) = @_;
# returns true iff the two tree objects differ other than in debian/
- # returns bitmas 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
local $/=undef;
my @cmd = (@git, qw(diff-tree --name-only -z));
push @cmd, qw(-r) if $finegrained;