[PATCH] Meta/Reintegrate: Record all merges to prevent losing topics

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Rebuilding an integration branch loses the initial topics when merging
results in fast-forwarding the history.

Force the integration branch to always record merge commits to ensure
we keep all of the topics on future integration branch rebuilds.

Signed-off-by: Bernt Hansen <bernt@xxxxxxxxx>
---
Thanks for this script Junio!

I started using this script today to clean up one of my integration
branches by separating the linear history into separate topics.  This
works great except for the minor glitch this patch fixes.

 Reintegrate |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Reintegrate b/Reintegrate
index dfdb73e..5909821 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -10,7 +10,7 @@ echo '#!/bin/sh
 while read branch eh
 do
 	case "$eh" in
-	"") git merge "$branch" || break ;;
+	"") git merge --no-ff "$branch" || break ;;
 	?*) echo >&2 "Eh? $branch $eh"; break ;;
 	esac
 done <<EOF'
-- 
1.6.2.rc0.55.g30aa4f
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux