Git development
 help / color / mirror / Atom feed
From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: "Galan Rémi" <remi.galan-alfonso@ensimag.grenoble-inp.fr>
Cc: Git List <git@vger.kernel.org>,
	Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>,
	Guillaume Pages <guillaume.pages@ensimag.grenoble-inp.fr>,
	Louis-Alexandre Stuber 
	<louis--alexandre.stuber@ensimag.grenoble-inp.fr>,
	Antoine Delaite <antoine.delaite@ensimag.grenoble-inp.fr>,
	Junio C Hamano <gitster@pobox.com>,
	Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH/RFCv4 2/2] git rebase -i: warn about removed commits
Date: Wed, 03 Jun 2015 19:38:31 +0200	[thread overview]
Message-ID: <vpq1thsbsko.fsf@anie.imag.fr> (raw)
In-Reply-To: <1433331859-24832-2-git-send-email-remi.galan-alfonso@ensimag.grenoble-inp.fr> ("Galan \=\?iso-8859-1\?Q\?R\=E9mi\=22's\?\= message of "Wed, 3 Jun 2015 13:44:19 +0200")

Galan Rémi <remi.galan-alfonso@ensimag.grenoble-inp.fr> writes:

> Check if commits were removed (i.e. a line was deleted) and print
> warnings or abort git rebase depending on the value of the
> configuration variable rebase.missingCommits.

Spelled missingCommitsCheck everywhere else.

> +rebase.missingCommitsCheck::
> +	If set to "warn" print warnings about removed commits in

If set to warn, print (comma). Here and below

> +	interactive mode. If set to "error" print the warnings and
> +	abort the rebase. If set to "ignore" no checking is
> +	done. "ignore" by default.


> +# Print the list of the SHA-1 of the commits
> +# from a todo list in a file.
> +# $1: todo-file, $2: outfile
> +todo_list_to_sha_list () {
> +	git stripspace --strip-comments <"$1" | while read -r command sha1 rest

I'd split the line in two:

	git stripspace --strip-comments <"$1" |
	while read -r command sha1 rest

> +	do
> +		case $command in
> +		x|"exec")
> +			;;
> +		*)
> +			printf "%s\n" "$sha1"
> +			;;
> +		esac
> +	done >"$2"
> +}

You're using $1 and $2 only to redirect input and output. I would find
it more elegant to write todo_list_to_sha_list as a filter, and do the
redirection in the call site (to keep the option of using
todo_list_to_sha_list in a pipe).

> +check_commits

You're not really checking commits, but rather the todo-list.

> +Use git --config rebase.missingCommitsCheck to change the level of warnings (ignore, warn, error).

Long line. Please, wrap the message to <80 columns.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

  parent reply	other threads:[~2015-06-03 17:38 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-03 11:44 [PATCH/RFCv4 1/2] git-rebase -i: add command "drop" to remove a commit Galan Rémi
2015-06-03 11:44 ` [PATCH/RFCv4 2/2] git rebase -i: warn about removed commits Galan Rémi
2015-06-03 12:48   ` Remi Galan Alfonso
2015-06-03 17:38   ` Matthieu Moy [this message]
2015-06-03 17:53     ` Remi Galan Alfonso
2015-06-03 18:06       ` Matthieu Moy
2015-06-03 19:14   ` [PATCH/RFCv2 " Eric Sunshine
2015-06-03 20:09     ` Remi Galan Alfonso
2015-06-06 23:45       ` Remi Galan Alfonso
2015-06-03 18:02 ` [PATCH/RFCv4 1/2] git-rebase -i: add command "drop" to remove a commit Junio C Hamano
2015-06-03 19:23   ` Remi Galan Alfonso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=vpq1thsbsko.fsf@anie.imag.fr \
    --to=matthieu.moy@grenoble-inp.fr \
    --cc=antoine.delaite@ensimag.grenoble-inp.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=guillaume.pages@ensimag.grenoble-inp.fr \
    --cc=louis--alexandre.stuber@ensimag.grenoble-inp.fr \
    --cc=remi.galan-alfonso@ensimag.grenoble-inp.fr \
    --cc=remi.lespinet@ensimag.grenoble-inp.fr \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox