trivial: remove the dots at the end of file names

Alex Riesen· Jan 5, 2006, 11:46 UTC · lore

to make the output more friendly to mouse copy-paste.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>

Subject: [PATCH] Remove the dots at the end of file names

to make the output more mouse copy-paste friendly.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>

---

 git-merge-one-file.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

fa0739c321265582ba8a914acedcb66f98980a86

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 7dee88a..5349a1c 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -82,7 +82,7 @@ case "${1:-.}${2:-.}${3:-.}" in
 		expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
 		;;
 	*)
-		echo "Auto-merging $4."
+		echo "Auto-merging $4"
 		orig=`git-unpack-file $1`
 		;;
 	esac
@@ -107,7 +107,7 @@ case "${1:-.}${2:-.}${3:-.}" in
 	fi
 
 	if [ $ret -ne 0 ]; then
-		echo "ERROR: Merge conflict in $4."
+		echo "ERROR: Merge conflict in $4"
 		exit 1
 	fi
 	exec git-update-index -- "$4"

-- 
1.0.GIT

Junio C Hamano· Jan 6, 2006, 22:37 UTC · re: Alex Riesen · lore

Re: trivial: remove the dots at the end of file names

Alex Riesen <raa.lkml@gmail.com> writes:

> Subject: [PATCH] Remove the dots at the end of file names
> to make the output more mouse copy-paste friendly.

> -		echo "ERROR: Merge conflict in $4."
> +		echo "ERROR: Merge conflict in $4"

Alex Riesen· Jan 7, 2006, 10:32 UTC · re: Junio C Hamano · lore

Re: trivial: remove the dots at the end of file names

Junio C Hamano, Fri, Jan 06, 2006 23:37:24 +0100:

> Alex Riesen <raa.lkml@gmail.com> writes:
> 
> > Subject: [PATCH] Remove the dots at the end of file names
> > to make the output more mouse copy-paste friendly.
> 
> > -		echo "ERROR: Merge conflict in $4."
> > +		echo "ERROR: Merge conflict in $4"
> 
> Hmph.  I think there are places we state pathname within 'single
> quotes' as a part of sentence, which may have the same issue.

No-no-no! These are perfectly fine (for bash, at least)!

> I understand and am sympathetic to the motivation, but at the same
> time messages that do not end with full-stop somehow make me feel
> quite uneasy. I'll swallow the patch; maybe it is just me.

I hope so. Don't you ever use mouse copy-pasting?!

Junio C Hamano· Jan 7, 2006, 10:35 UTC · re: Alex Riesen · lore

Re: trivial: remove the dots at the end of file names

Alex Riesen <raa.lkml@gmail.com> writes:

> I hope so. Don't you ever use mouse copy-pasting?!