use --force-if-inclues alongside --force-with-lease

kiprasmel · kiprasmel · commit bbcb1d21fddd · 2022-05-08T12:09:42.000+03:00
Signed-off-by: Kipras Melnikovas &lt;kipras@kipras.org&gt;
diff --git a/forcePush.ts b/forcePush.ts
@@ -58,8 +58,13 @@ export const forcePush: BranchSequencerBase = (argsBase) =>
 			 *
 			 * needs to be further explored with our `--sync` (TBD)
 			 *
+			 *
+			 * on --force-if-includes, see:
+			 * - `man git-push`
+			 * - https://stackoverflow.com/a/65839129/9285308
+			 * - https://github.com/gitextensions/gitextensions/issues/8753#issuecomment-763390579
 			 */
-			const forceWithLeaseOrForce: string = "--force-with-lease";
+			const forceWithLeaseOrForce: string = "--force-with-lease --force-if-includes";
 
 			if (!upstreamBranch) {
 				const remotes: string[] = await repo.getRemoteNames();

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,13 @@ export const forcePush: BranchSequencerBase = (argsBase) =>`
`58`	`58`	`*`
`59`	`59`	* needs to be further explored with our `--sync` (TBD)
`60`	`60`	`*`
	`61`	`+ *`
	`62`	`+ * on --force-if-includes, see:`
	`63`	+ * - `man git-push`
	`64`	`+ * - https://stackoverflow.com/a/65839129/9285308`
	`65`	`+ * - https://github.com/gitextensions/gitextensions/issues/8753#issuecomment-763390579`
`61`	`66`	`*/`
`62`		`- const forceWithLeaseOrForce: string = "--force-with-lease";`
	`67`	`+ const forceWithLeaseOrForce: string = "--force-with-lease --force-if-includes";`
`63`	`68`
`64`	`69`	`if (!upstreamBranch) {`
`65`	`70`	`const remotes: string[] = await repo.getRemoteNames();`