Re: [PATCH v7 2/4] git-cherry-pick: Add keep-redundant-commits option
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 18, 2012, 22:59 UTC
- Message-ID
- <7vfwc0k5nu.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1334776680-23460-3-git-send-email-nhorman@tuxdriver.com>
Neil Horman <nhorman@tuxdriver.com> writes:
Show 18 quoted lines
> diff --git a/sequencer.c b/sequencer.c
> index 71929ba..e33dfbb 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -13,6 +13,7 @@
> #include "rerere.h"
> #include "merge-recursive.h"
> #include "refs.h"
> +#include "argv-array.h"
>
> #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
>
> @@ -251,6 +252,30 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
> return !clean;
> }
>
> +static int is_index_unchanged()
> +{Hmm... I am reasonably sure I fixed this when I queued the previous one to 'pu'.
static int is_index_unchanged(void)
{