git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2] rebase -i: avoid 'git reset' when possible

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Mar 3, 2009, 11:19 UTC
Message-ID
<49AD1250.4080708@viscovery.net>
In-Reply-To
<alpine.DEB.1.00.0903031024420.6399@intel-tinevez-2-302>
Johannes Schindelin schrieb:
Show 8 quoted lines
> +# skip picking commits whose parents are unchanged
> +skip_unnecessary_picks () {
> +	fd=3
> +	while read command sha1 rest
> +	do
> +		# fd=3 means we skip the command
> +		case "$fd,$command,$(git rev-parse --verify --quiet $sha1^)" in
> +		3,pick,"$ONTO"*|t,p,"$ONTO"*)
s/t,/3,/
Show 15 quoted lines
> +			# pick a commit whose parent is current $ONTO -> skip
> +			ONTO=$sha1
> +			;;
> +		3,#*|3,,*)
> +			# copy comments
> +			;;
> +		*)
> +			fd=1
> +			;;
> +		esac
> +		echo "$command${sha1:+ }$sha1${rest:+ }$rest" >&$fd
> +	done < "$TODO" > "$TODO.new" 3>> "$DONE" &&
> +	mv -f "$TODO".new "$TODO" ||
> +	die "Could not skip unnecessary pick commands"
> +}
-- Hannes
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 14 of 16 in “[RFH] rebase -i optimization”
  1. Sverre RabbelierFeb 26, 2009
  2. Johannes SchindelinFeb 26, 2009
  3. Sverre RabbelierFeb 26, 2009
  4. Johannes SchindelinFeb 27, 2009
  5. Sverre RabbelierFeb 27, 2009
  6. rebase -i: avoid 'git reset' when possibleJohannes Schindelin, Feb 27, 2009
  7. Sverre RabbelierFeb 27, 2009
  8. Johannes SchindelinFeb 27, 2009
  9. Junio C HamanoMar 1, 2009
  10. Johannes SchindelinMar 1, 2009
  11. Junio C HamanoMar 3, 2009
  12. Johannes SchindelinMar 3, 2009
  13. rebase -i: avoid 'git reset' when possibleJohannes Schindelin, Mar 3, 2009
  14. Johannes SixtMar 3, 2009
  15. Johannes SchindelinMar 3, 2009
  16. Sitaram ChamartyFeb 27, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.