Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
alpine-conf
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
19
Issues
19
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
alpine-conf
Commits
5368f0a5
Commit
5368f0a5
authored
Aug 26, 2014
by
Natanael Copa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lbu: use --no-dereference with diff when possible
parent
d2635c34
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
lbu.in
lbu.in
+5
-1
No files found.
lbu.in
View file @
5368f0a5
...
...
@@ -672,6 +672,7 @@ usage: $PROGRAM diff [<media>]
}
cmd_diff
()
{
local
diff_opts
=
LBU_MEDIA
=${
1
:-
"$LBU_MEDIA"
}
[
-
z
"$LBU_MEDIA"
]
&&
[
-
z
"$LBU_BACKUPDIR"
]
&&
usage_diff
local
tmp
...
...
@@ -680,7 +681,10 @@ cmd_diff() {
unpack_apkovl
"$tmp/a"
ENCRYPTION
=
cmd_package
-
|
tar
-
C
"$tmp/b"
-
zx
cd
"$tmp"
&&
diff
-
ruN
a
b
if
diff
--
help
2
>&
1
|
grep
-
q
--
--
no
-
dereference
;
then
diff_opts
=
"--no-dereference"
fi
cd
"$tmp"
&&
diff
-
ruN
$
diff_opts
a
b
}
#
migrate
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment