* [PATCH] git-mergetool: de-bashify function declarations
@ 2007-03-30 3:26 Jeff King
2007-03-30 4:03 ` Jeff King
0 siblings, 1 reply; 2+ messages in thread
From: Jeff King @ 2007-03-30 3:26 UTC (permalink / raw)
To: Junio C Hamano; +Cc: tytso, git
Signed-off-by: Jeff King <peff@peff.net>
---
Works fine otherwise for me using dash as /bin/sh...
git-mergetool.sh | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 7942fd0..68b35d3 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -14,19 +14,19 @@ SUBDIRECTORY_OK=Yes
require_work_tree
# Returns true if the mode reflects a symlink
-function is_symlink () {
+is_symlink () {
test "$1" = 120000
}
-function local_present () {
+local_present () {
test -n "$local_mode"
}
-function remote_present () {
+remote_present () {
test -n "$remote_mode"
}
-function base_present () {
+base_present () {
test -n "$base_mode"
}
@@ -39,7 +39,7 @@ cleanup_temp_files () {
fi
}
-function describe_file () {
+describe_file () {
mode="$1"
branch="$2"
file="$3"
--
1.5.1.rc2.638.g85e08-dirty
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] git-mergetool: de-bashify function declarations
2007-03-30 3:26 [PATCH] git-mergetool: de-bashify function declarations Jeff King
@ 2007-03-30 4:03 ` Jeff King
0 siblings, 0 replies; 2+ messages in thread
From: Jeff King @ 2007-03-30 4:03 UTC (permalink / raw)
To: Junio C Hamano; +Cc: tytso, git
On Thu, Mar 29, 2007 at 11:26:45PM -0400, Jeff King wrote:
> # Returns true if the mode reflects a symlink
> -function is_symlink () {
> +is_symlink () {
> test "$1" = 120000
> }
Oops, looks like Ted already fixed this, but it just hasn't been pulled
yet. Sorry for the noise.
-Peff
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-03-30 4:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-30 3:26 [PATCH] git-mergetool: de-bashify function declarations Jeff King
2007-03-30 4:03 ` Jeff King
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).