From mboxrd@z Thu Jan 1 00:00:00 1970 From: Neil Horman Subject: [PATCH v4 0/4] Enhance git-rebases flexibiilty in handling empty commits Date: Wed, 11 Apr 2012 16:21:52 -0400 Message-ID: <1334175716-11391-1-git-send-email-nhorman@tuxdriver.com> References: Cc: Jeff King , Phil Hord , Junio C Hamano , Neil Horman To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Apr 11 22:22:33 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SI43j-0003fQ-Nv for gcvg-git-2@plane.gmane.org; Wed, 11 Apr 2012 22:22:32 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757026Ab2DKUW1 (ORCPT ); Wed, 11 Apr 2012 16:22:27 -0400 Received: from charlotte.tuxdriver.com ([70.61.120.58]:37739 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754625Ab2DKUW0 (ORCPT ); Wed, 11 Apr 2012 16:22:26 -0400 Received: from hmsreliant.think-freely.org ([2001:470:8:a08:7aac:c0ff:fec2:933b] helo=localhost) by smtp.tuxdriver.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63) (envelope-from ) id 1SI43N-0004cI-BU; Wed, 11 Apr 2012 16:22:22 -0400 X-Mailer: git-send-email 1.7.7.6 In-Reply-To: X-Spam-Score: -2.9 (--) X-Spam-Status: No Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: git's ability to handle empty commits is somewhat lacking, especially when preforming a rebase. Nominally empty commits are undesireable entries, the result of commits that are made empty by prior commits covering the same changs. But occasionally, empty commits are useful to developers (e.g. inserting notes into the development history without changing any code along the way). In these cases its desireable to easily preserve empty commits during operations like rebases. This patch series enhances git to do just that. It adds two options to the git-cherry-pick command, --allow-empty, which allows git cherry-pick to preserve an empty commit, even if the fast forward logic isn't applicable during the operation, and --keep-redundant-commits, which allows the user to also keep commits that were made empty via conflict resolution. It also enhances git-rebase to add a --keep-empty option which enables rebases to preserve empty commits. I've tested these operations out myself here and they work well for me Signed-off-by: Neil Horman --- Change notes: Based on version 1 feedback from this list, the following changes have been made V2) * Changed --keep-empty to --allow-empty in the git cherry-pick command * Converted run_git_commit to use argv_array * Updated cherry-pick --allow-empty description in man page * added ignore-if-made-empty option to git-cherry-pick * Added test to test suite to validate the new cherry-pick options * Updated git-rebase man page to be less verbose and more accurate in the description of the keep-empty option * squashed the addition of the keep-empty flag in git-rebase down to one commit from 3 * fixed up coding style in git-rebase script * Optimized detection of empty commits * Only augmented git-rebase-editor message if empty commits are possible V3) * reversed the --ignore-if-empty-logic to by default only keep initially empty commits * replaced --ignore-if-empty with --keep-redundant-commits, to allow empty commits that are made empty via conflict resolution, in addition to commits that were created as empty * reworked is_original_commit_empty to be more efficient and portable * Misc sylistic and spelling cleanups V4) * Reverted the cherry-pick advice changes in V3 based on in-thread discussion * Rewrote my changes to is_original_commit_empty and run_git_commit to not have to fork, making them more efficient.