# [PATCH] rebase-i: print abbreviated hash when stop for editing 5 messages from 2016-03-24 to 2016-03-28. Participants: Ralf Thielow, Junio C Hamano. Thread: https://gitlist.dev/t/41814 ## Ralf Thielow, 2016-03-24 18:31 Subject: [PATCH] rebase-i: print abbreviated hash when stop for editing Message-ID: <1458844281-13107-1-git-send-email-ralf.thielow@gmail.com> URL: https://gitlist.dev/e/1458844281-13107-1-git-send-email-ralf.thielow%40gmail.com ``` Signed-off-by: Ralf Thielow --- git-rebase--interactive.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 4cde685..9ea3075 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -548,7 +548,8 @@ do_next () { mark_action_done do_pick $sha1 "$rest" - warn "Stopped at $sha1... $rest" + sha1_abbrev=$(git rev-parse --short $sha1) + warn "Stopped at $sha1_abbrev... $rest" exit_with_patch $sha1 0 ;; squash|s|fixup|f) -- 2.8.0.rc4.7.g35d7ca9.dirty ``` ## Junio C Hamano, 2016-03-24 19:56 Subject: Re: [PATCH] rebase-i: print abbreviated hash when stop for editing Message-ID: URL: https://gitlist.dev/e/xmqqfuvf8xav.fsf%40gitster.mtv.corp.google.com In-Reply-To: <1458844281-13107-1-git-send-email-ralf.thielow@gmail.com> ``` Ralf Thielow writes: > Signed-off-by: Ralf Thielow > --- Hmph, the reason why this is a good thing to do is because an overlong $sha1 would push $rest too far to the right (possibly making it overflow to the next line)? > git-rebase--interactive.sh | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > index 4cde685..9ea3075 100644 > --- a/git-rebase--interactive.sh > +++ b/git-rebase--interactive.sh > @@ -548,7 +548,8 @@ do_next () { > > mark_action_done > do_pick $sha1 "$rest" > - warn "Stopped at $sha1... $rest" > + sha1_abbrev=$(git rev-parse --short $sha1) > + warn "Stopped at $sha1_abbrev... $rest" > exit_with_patch $sha1 0 > ;; > squash|s|fixup|f) ``` ## Ralf Thielow, 2016-03-24 21:06 Subject: Re: [PATCH] rebase-i: print abbreviated hash when stop for editing Message-ID: URL: https://gitlist.dev/e/CAN0XMOJKq7nvyVu57g%3DFi3195oG4pDbL7mw3urL33iJDb4Y0cA%40mail.gmail.com In-Reply-To: ``` 2016-03-24 20:56 GMT+01:00 Junio C Hamano : > Ralf Thielow writes: > >> Signed-off-by: Ralf Thielow >> --- > > Hmph, the reason why this is a good thing to do is because an > overlong $sha1 would push $rest too far to the right (possibly > making it overflow to the next line)? > Yes. Another solution would have been to remove the "..." at the end, but I prefer to see a shorter message rather than having the full sha1 for whatever reason. > >> git-rebase--interactive.sh | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh >> index 4cde685..9ea3075 100644 >> --- a/git-rebase--interactive.sh >> +++ b/git-rebase--interactive.sh >> @@ -548,7 +548,8 @@ do_next () { >> >> mark_action_done >> do_pick $sha1 "$rest" >> - warn "Stopped at $sha1... $rest" >> + sha1_abbrev=$(git rev-parse --short $sha1) >> + warn "Stopped at $sha1_abbrev... $rest" >> exit_with_patch $sha1 0 >> ;; >> squash|s|fixup|f) ``` ## Ralf Thielow, 2016-03-28 16:00 Subject: [PATCH v2] rebase-i: print an abbreviated hash when stop for editing Message-ID: <1459180800-5744-1-git-send-email-ralf.thielow@gmail.com> URL: https://gitlist.dev/e/1459180800-5744-1-git-send-email-ralf.thielow%40gmail.com In-Reply-To: <1458844281-13107-1-git-send-email-ralf.thielow@gmail.com> ``` The message that is shown when rebase-i stops for editing prints the full hash of the commit where it stopped which makes the message overflow to the next line on smaller terminal windows. Print an abbreviated hash instead. Signed-off-by: Ralf Thielow --- git-rebase--interactive.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 4cde685..9ea3075 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -548,7 +548,8 @@ do_next () { mark_action_done do_pick $sha1 "$rest" - warn "Stopped at $sha1... $rest" + sha1_abbrev=$(git rev-parse --short $sha1) + warn "Stopped at $sha1_abbrev... $rest" exit_with_patch $sha1 0 ;; squash|s|fixup|f) -- 2.8.0.rc4.285.gc3ac548 ``` ## Junio C Hamano, 2016-03-28 18:43 Subject: Re: [PATCH v2] rebase-i: print an abbreviated hash when stop for editing Message-ID: URL: https://gitlist.dev/e/xmqqshzaxx33.fsf%40gitster.mtv.corp.google.com In-Reply-To: <1459180800-5744-1-git-send-email-ralf.thielow@gmail.com> ``` Ralf Thielow writes: > The message that is shown when rebase-i stops for editing prints > the full hash of the commit where it stopped which makes the message > overflow to the next line on smaller terminal windows. Print an > abbreviated hash instead. > > Signed-off-by: Ralf Thielow > --- Thanks, will queue. > git-rebase--interactive.sh | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > index 4cde685..9ea3075 100644 > --- a/git-rebase--interactive.sh > +++ b/git-rebase--interactive.sh > @@ -548,7 +548,8 @@ do_next () { > > mark_action_done > do_pick $sha1 "$rest" > - warn "Stopped at $sha1... $rest" > + sha1_abbrev=$(git rev-parse --short $sha1) > + warn "Stopped at $sha1_abbrev... $rest" > exit_with_patch $sha1 0 > ;; > squash|s|fixup|f) ```