{"thread":{"id":"35040","subject":"[PATCH] rebase -i: respect to core.abbrev","startedAt":"2013-09-28T16:07:15Z","lastAt":"2013-09-30T21:36:05Z","messageCount":4,"participants":["Kirill A. Shutemov","Eric Sunshine","Jonathan Nieder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"228361","messageId":"1380384435-20846-1-git-send-email-kirill.shutemov@linux.intel.com","threadId":"35040","inReplyTo":null,"subject":"[PATCH] rebase -i: respect to core.abbrev","fromName":"Kirill A. Shutemov","fromEmail":"kirill.shutemov@linux.intel.com","sentAt":"2013-09-28T16:07:15Z","receivedAt":"2013-09-28T16:07:15Z","isPatch":true,"sender":{"key":"kirill.shutemov@linux.intel.com","avatar":"https://avatars.githubusercontent.com/u/588661?v=4"},"body":"git rebase -i collapses ids on todo list to 7 hexdigits.\nLet's use core.abbrev config option instead, if it's set.\n\nSigned-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>\n---\n git-rebase--interactive.sh | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex 10bf318d0d..078c28ff1b 100644\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -713,7 +713,8 @@ expand_todo_ids() {\n }\n \n collapse_todo_ids() {\n-\ttransform_todo_ids --short=7\n+\tabbrev=\"$(git config --get 'core.abbrev')\"\n+\ttransform_todo_ids --short=\"${abbrev:-7}\"\n }\n \n # Rearrange the todo list that has both \"pick sha1 msg\" and\n-- \n1.8.4.rc3\n"},{"id":"228363","messageId":"20130928211013.54361E0090@blue.fi.intel.com","threadId":"35040","inReplyTo":"1380384435-20846-1-git-send-email-kirill.shutemov@linux.intel.com","subject":"RE: [PATCH] rebase -i: respect to core.abbrev","fromName":"Kirill A. Shutemov","fromEmail":"kirill.shutemov@linux.intel.com","sentAt":"2013-09-28T21:10:13Z","receivedAt":"2013-09-28T21:10:13Z","isPatch":true,"sender":{"key":"kirill.shutemov@linux.intel.com","avatar":"https://avatars.githubusercontent.com/u/588661?v=4"},"body":"Kirill A. Shutemov wrote:\n> git rebase -i collapses ids on todo list to 7 hexdigits.\n> Let's use core.abbrev config option instead, if it's set.\n> \n> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>\n> ---\n>  git-rebase--interactive.sh | 3 ++-\n>  1 file changed, 2 insertions(+), 1 deletion(-)\n> \n> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\n> index 10bf318d0d..078c28ff1b 100644\n> --- a/git-rebase--interactive.sh\n> +++ b/git-rebase--interactive.sh\n> @@ -713,7 +713,8 @@ expand_todo_ids() {\n>  }\n>  \n>  collapse_todo_ids() {\n> -\ttransform_todo_ids --short=7\n> +\tabbrev=\"$(git config --get 'core.abbrev')\"\n> +\ttransform_todo_ids --short=\"${abbrev:-7}\"\n\n\nSimpler version is below.\n\n>From 933a4159f0c037a37f3b251a4f13deea7f17b6c3 Mon Sep 17 00:00:00 2001\nFrom: \"Kirill A. Shutemov\" <kirill.shutemov@linux.intel.com>\nDate: Sat, 28 Sep 2013 18:53:05 +0300\nSubject: [PATCH] rebase -i: respect to core.abbrev\n\ncollapse_todo_ids() uses `git rev-parse --short=7' to abbrev commit ids.\nLet's drop argument from --short to use default (7) or config value\ninstead.\n\nSigned-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>\n---\n git-rebase--interactive.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex 10bf318d0d..3c6bed9a28 100644\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -713,7 +713,7 @@ expand_todo_ids() {\n }\n \n collapse_todo_ids() {\n-\ttransform_todo_ids --short=7\n+\ttransform_todo_ids --short\n }\n \n # Rearrange the todo list that has both \"pick sha1 msg\" and\n-- \n Kirill A. Shutemov\n"},{"id":"228430","messageId":"CAPig+cTpSTrcPBa+Xs5Lw6bQ5TvSHqEh1tnEoZS6eX8Z9GTm4w@mail.gmail.com","threadId":"35040","inReplyTo":"20130928211013.54361E0090@blue.fi.intel.com","subject":"Re: [PATCH] rebase -i: respect to core.abbrev","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2013-09-29T02:49:02Z","receivedAt":"2013-09-29T02:49:02Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Sat, Sep 28, 2013 at 5:10 PM, Kirill A. Shutemov\n<kirill.shutemov@linux.intel.com> wrote:\n> collapse_todo_ids() uses `git rev-parse --short=7' to abbrev commit ids.\n> Let's drop argument from --short to use default (7) or config value\n> instead.\n>\n> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>\n> ---\n>  git-rebase--interactive.sh | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\n> index 10bf318d0d..3c6bed9a28 100644\n> --- a/git-rebase--interactive.sh\n> +++ b/git-rebase--interactive.sh\n> @@ -713,7 +713,7 @@ expand_todo_ids() {\n>  }\n>\n>  collapse_todo_ids() {\n> -       transform_todo_ids --short=7\n> +       transform_todo_ids --short\n\nThanks, I was going to suggest this exact simplification upon reading v1.\n\nAcked-by: Eric Sunshine <sunshine@sunshineco.com>\n\n>  }\n>\n>  # Rearrange the todo list that has both \"pick sha1 msg\" and\n> --\n>  Kirill A. Shutemov\n"},{"id":"228483","messageId":"20130930213605.GZ9464@google.com","threadId":"35040","inReplyTo":"20130928211013.54361E0090@blue.fi.intel.com","subject":"Re: [PATCH] rebase -i: respect to core.abbrev","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-09-30T21:36:05Z","receivedAt":"2013-09-30T21:36:05Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Kirill A. Shutemov wrote:\n\n> collapse_todo_ids() uses `git rev-parse --short=7' to abbrev commit ids.\n> Let's drop argument from --short to use default (7) or config value\n> instead.\n\nSince the todo ids are expanded immediately after the editor exits,\nthere is not much risk of accidental hash collision due to new\nobjects, so this should be safe.\n\nThanks, both.\n"}]}