Skip to content

Commit c7658ec

Browse files
authored
Merge pull request #411 from github/snh/disable-pager
Disable pager and context when running git-diff
2 parents 5ea6eb3 + 7b56ee0 commit c7658ec

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

share/github-backup-utils/ghe-backup-repositories

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ if [ -z "$GHE_SKIP_ROUTE_VERIFICATION" ]; then
370370
cat $tempdir/*.rsync | sort | uniq > $tempdir/source_routes
371371
(cd $backup_dir/ && find * -mindepth 5 -maxdepth 6 -type d -name \*.git -exec dirname {} \; | sort | uniq) > $tempdir/destination_routes
372372

373-
git diff -- $tempdir/source_routes $tempdir/destination_routes || echo "Warning: One or more repository networks and/or gists were not found on the source appliance. Please contact GitHub Enterprise Support for assistance."
373+
git --no-pager diff --unified=0 --no-prefix -- $tempdir/source_routes $tempdir/destination_routes || echo "Warning: One or more repository networks and/or gists were not found on the source appliance. Please contact GitHub Enterprise Support for assistance."
374374

375375
bm_end "$(basename $0) - Verifying Routes"
376376
fi

share/github-backup-utils/ghe-backup-storage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ if [ -z "$GHE_SKIP_ROUTE_VERIFICATION" ]; then
143143
cat $tempdir/*.rsync | sort | uniq > $tempdir/source_routes
144144
(cd $backup_dir/ && find * -mindepth 3 -maxdepth 3 -type f -print | sort | uniq) > $tempdir/destination_routes
145145

146-
git diff -- $tempdir/source_routes $tempdir/destination_routes || echo "Warning: One or more storage objects were not found on the source appliance. Please contact GitHub Enterprise Support for assistance."
146+
git --no-pager diff --unified=0 --no-prefix -- $tempdir/source_routes $tempdir/destination_routes || echo "Warning: One or more storage objects were not found on the source appliance. Please contact GitHub Enterprise Support for assistance."
147147

148148
bm_end "$(basename $0) - Verifying Routes"
149149
fi

0 commit comments

Comments
 (0)