diff --git a/doc/bugs/adb_creates_empty_commits_on_import__47__sync.mdwn b/doc/bugs/adb_creates_empty_commits_on_import__47__sync.mdwn index de0d91281c..5beee2397e 100644 --- a/doc/bugs/adb_creates_empty_commits_on_import__47__sync.mdwn +++ b/doc/bugs/adb_creates_empty_commits_on_import__47__sync.mdwn @@ -1,5 +1,7 @@ ### Please describe the problem. +[[!meta title="import tree creates empty commits"]] + Adb special remote on both "import" and "sync" commands creates empty commits in "main" branch, even if files hadn't changed in either remote or local repo. diff --git a/doc/bugs/adb_creates_empty_commits_on_import__47__sync/comment_1_522c68d019e5db592e140db9501435ba._comment b/doc/bugs/adb_creates_empty_commits_on_import__47__sync/comment_1_522c68d019e5db592e140db9501435ba._comment new file mode 100644 index 0000000000..6ab85944bb --- /dev/null +++ b/doc/bugs/adb_creates_empty_commits_on_import__47__sync/comment_1_522c68d019e5db592e140db9501435ba._comment @@ -0,0 +1,20 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2022-01-03T17:32:34Z" + content=""" +I guess you mean commits like "import from foo", +or perhaps "remote tracking branch". Not adb-specific at all. + +The "remote tracking branch" commits are merge commits, so cannot be +avoided, even though they don't make any apparent changes. + +It mostly does manage to avoid making the "import from" commits +when there is no difference from the previous commit. +The only case I know of where it does not is in the initial import, +if the branch was exported first, and then imported. I see an empty +"import from" then. Subsequent imports, when there are no changes to the +tree, do not make a new commit. + +Of course, you can rebase out any of these commits if you want to. +"""]]