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

Re: [PATCH] interpret_nth_last_branch(): avoid traversing the reflogs twice

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 19, 2009, 08:19 UTC
Message-ID
<7vljt7r9mq.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<7vprijra52.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 33 quoted lines
> Well, I would rather be in favor of something like this.
>
> -- >8 --
> Subject: interpret_nth_last_branch(): avoid traversing the reflog twice
>
> You can have quite a many reflog entries, but you typically won't recall
> which branch you were on after switching branches for more than several
> times.
>
> Instead of reading the reflog twice, this reads the branch switching event
> and keeps the latest 16 (which is an arbitrary limitation that should be
> plenty) such entry, to switch back to the branch we were recently on.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>  sha1_name.c              |   48 +++++++++++++++++++++------------------------
>  t/t2012-checkout-last.sh |   44 ++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 66 insertions(+), 26 deletions(-)
>
> diff --git a/sha1_name.c b/sha1_name.c
> index 9e1538e..d6622f2 100644
> --- a/sha1_name.c
> +++ b/sha1_name.c
> @@ -750,19 +746,19 @@ int interpret_nth_last_branch(const char *name, struct strbuf *buf)
>  	nth = strtol(name+3, &num_end, 10);
>  	if (num_end != brace)
>  		return -1;
> ...
> -	if (cb.nth < nth)
> -		return 0;
> ...
> +	if (cb.cnt < nth)
> +		return -1;
This should (obviously) be "return 0".
Previous: Junio C HamanoNext: Johannes Schindelin
Message 36 of 56 in “N-th last checked out branch”
  1. 0/6 N-th last checked out branchThomas Rast, Jan 17, 2009
  2. 1/6 reflog: refactor parsing and checkingThomas Rast, Jan 17, 2009
  3. 2/6 reflog: refactor log open+mmapThomas Rast, Jan 17, 2009
  4. 3/6 reflog: make for_each_reflog_ent use mmapThomas Rast, Jan 17, 2009
  5. 4/6 reflog: add backwards iteratorThomas Rast, Jan 17, 2009
  6. 5/6 sha1_name: implement @{-N} syntax for N-th last checked outThomas Rast, Jan 17, 2009
  7. 6/6 checkout: implement '@{-N}' and '-' special abbreviationsThomas Rast, Jan 17, 2009
  8. Johannes SchindelinJan 17, 2009
  9. Johannes SchindelinJan 17, 2009
  10. Johannes SchindelinJan 17, 2009
  11. Thomas RastJan 17, 2009
  12. 1/2 sha1_name: implement @{-N} syntax for N-th last checked outThomas Rast, Jan 17, 2009
  13. 2/2 checkout: implement '@{-N}' and '-' special abbreviationsThomas Rast, Jan 17, 2009
  14. interpret_nth_last_branch(): avoid traversing the reflogs twiceJohannes Schindelin, Jan 17, 2009
  15. 0/5 N-th last checked out branchThomas Rast, Jan 17, 2009
  16. 1/5 checkout: implement "@{-N}" shortcut name for N-th last branchThomas Rast, Jan 17, 2009
  17. 2/5 sha1_name: tweak @{-N} lookupThomas Rast, Jan 17, 2009
  18. 3/5 sha1_name: support @{-N} syntax in get_sha1()Thomas Rast, Jan 17, 2009
  19. 4/5 checkout: implement "-" abbreviation, add docs and testsThomas Rast, Jan 17, 2009
  20. 5/5 interpret_nth_last_branch(): avoid traversing the reflogs twiceThomas Rast, Jan 17, 2009
  21. 6/5 Fix parsing of @{-1}@{1}Johannes Schindelin, Jan 17, 2009
  22. Junio C HamanoJan 17, 2009
  23. Johannes SchindelinJan 17, 2009
  24. Junio C HamanoJan 17, 2009
  25. Johannes SchindelinJan 17, 2009
  26. Junio C HamanoJan 17, 2009
  27. Junio C HamanoJan 18, 2009
  28. Johannes SchindelinJan 17, 2009
  29. Junio C HamanoJan 17, 2009
  30. Johannes SchindelinJan 17, 2009
  31. Junio C HamanoJan 18, 2009
  32. Johannes SchindelinJan 18, 2009
  33. Junio C HamanoJan 18, 2009
  34. Johannes SchindelinJan 18, 2009
  35. Junio C HamanoJan 19, 2009
  36. Junio C HamanoJan 19, 2009
  37. Johannes SchindelinJan 19, 2009
  38. Thomas RastJan 20, 2009
  39. Johannes SchindelinJan 20, 2009
  40. Thomas RastJan 20, 2009
  41. interpret_nth_last_branch(): plug small memleakJunio C Hamano, Jan 20, 2009
  42. Johannes SchindelinJan 20, 2009
  43. Introduce for_each_recent_reflog_ent().Junio C Hamano, Jan 20, 2009
  44. Johannes SchindelinJan 20, 2009
  45. Junio C HamanoJan 20, 2009
  46. Fix invalid memory accessJohannes Schindelin, Jan 21, 2009
  47. Junio C HamanoJan 21, 2009
  48. Thomas RastJan 21, 2009
  49. Junio C HamanoJan 21, 2009
  50. Johannes SchindelinJan 21, 2009
  51. Thomas RastJan 24, 2009
  52. t1505: remove debugging cruftThomas Rast, Jan 24, 2009
  53. Junio C HamanoJan 25, 2009
  54. Johannes SchindelinJan 21, 2009
  55. @{-<n>}: avoid crash with corrupt reflogJohannes Schindelin, Jan 19, 2009
  56. Johannes SchindelinJan 19, 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.