trivial: remove the dots at the end of file names

trivial: remove the dots at the end of file names

[Alex Riesen]

[-- Attachment #1: Type: text/plain, Size: 106 bytes --]

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

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

[-- Attachment #2: 0004-Remove-the-dots-at-the-end-of-file-names-to-make-the-output-more-mouse-copy-paste-friendly.txt --]
[-- Type: text/plain, Size: 868 bytes --]

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

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

[Junio C Hamano]

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.  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.

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

[Alex Riesen]

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?!

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

[Junio C Hamano]

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

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

Not mouse, but I always work inside "screen" and use
copy&paste.