configs  Check-in [be955ae008]

Overview
Comment:git2fl: Fix incremental import
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: be955ae008873c0ccee980effb6b210915a7196fd5b75d958caf921910572a4c
User & Date: js 2020-05-30 15:41:17
Context
2020-06-01
09:34
zshrc: Add fl2git command to export Fossil -> Git check-in: 65f43c9c86 user: js tags: trunk
2020-05-30
15:41
git2fl: Fix incremental import check-in: be955ae008 user: js tags: trunk
13:14
zshrc: Add git2fl command to import Git -> Fossil check-in: 5d30571be0 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to zshrc.

︙︙
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239

		local repo=$(fossil info | awk '/^repository:/ { print $2 }')

		[ -z "$repo" ] && repo="$1"

		[ -n "$repo" -a -f "$repo" ] &&
			local incremental="--incremental"

		[ -d "$gitdir/git.marks" ] &&
			local importmarks_git="--import-marks=$gitdir/git.marks"

		if [ -d "$gitdir/fossil.marks" ]; then
			local importmarks_fossil
			importmarks_fossil="--import-marks $gitdir/fossil.marks"
		fi

		LC_ALL=C git fast-export			\
			--signed-tags=warn-strip		\
			--export-marks=$gitdir/git.marks	\








|


|








222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239

		local repo=$(fossil info | awk '/^repository:/ { print $2 }')

		[ -z "$repo" ] && repo="$1"

		[ -n "$repo" -a -f "$repo" ] &&
			local incremental="--incremental"

		[ -f "$gitdir/git.marks" ] &&
			local importmarks_git="--import-marks=$gitdir/git.marks"

		if [ -f "$gitdir/fossil.marks" ]; then
			local importmarks_fossil
			importmarks_fossil="--import-marks $gitdir/fossil.marks"
		fi

		LC_ALL=C git fast-export			\
			--signed-tags=warn-strip		\
			--export-marks=$gitdir/git.marks	\
︙︙