* [PATCH] pull: remove extra space from reflog message
@ 2011-07-29 7:19 Ori Avtalion
2011-08-01 23:04 ` Junio C Hamano
0 siblings, 1 reply; 4+ messages in thread
From: Ori Avtalion @ 2011-07-29 7:19 UTC (permalink / raw)
To: git
When executing "git pull" with no arguments, the reflog message was:
"pull : Fast-forward"
Signed-off-by: Ori Avtalion <ori@avtalion.name>
---
This is a correction of my earlier patch, based on the suggestion
by Andreas Schwab
git-pull.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index a10b129..eec3a07 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -10,7 +10,7 @@ SUBDIRECTORY_OK=Yes
OPTIONS_SPEC=
. git-sh-setup
. git-sh-i18n
-set_reflog_action "pull $*"
+set_reflog_action "pull${1+ $*}"
require_work_tree
cd_to_toplevel
--
1.7.4.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] pull: remove extra space from reflog message
2011-07-29 7:19 [PATCH] pull: remove extra space from reflog message Ori Avtalion
@ 2011-08-01 23:04 ` Junio C Hamano
0 siblings, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2011-08-01 23:04 UTC (permalink / raw)
To: Ori Avtalion; +Cc: git
Ori Avtalion <ori@avtalion.name> writes:
> When executing "git pull" with no arguments, the reflog message was:
> "pull : Fast-forward"
>
> Signed-off-by: Ori Avtalion <ori@avtalion.name>
> ---
>
> This is a correction of my earlier patch, based on the suggestion
> by Andreas Schwab
>
> git-pull.sh | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/git-pull.sh b/git-pull.sh
> index a10b129..eec3a07 100755
> --- a/git-pull.sh
> +++ b/git-pull.sh
> @@ -10,7 +10,7 @@ SUBDIRECTORY_OK=Yes
> OPTIONS_SPEC=
> . git-sh-setup
> . git-sh-i18n
> -set_reflog_action "pull $*"
> +set_reflog_action "pull${1+ $*}"
> require_work_tree
> cd_to_toplevel
Thanks, will queue.
I wonder if we have any test in the contents of the reflog messages,
though.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] pull: remove extra space from reflog message
@ 2011-07-20 21:19 Ori Avtalion
2011-07-20 22:22 ` Andreas Schwab
0 siblings, 1 reply; 4+ messages in thread
From: Ori Avtalion @ 2011-07-20 21:19 UTC (permalink / raw)
To: git
When executing "git pull" with no arguments, the reflog message was:
"pull : Fast-forward"
Signed-off-by: Ori Avtalion <ori@avtalion.name>
---
git-pull.sh | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index a10b129..a305978 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -10,7 +10,11 @@ SUBDIRECTORY_OK=Yes
OPTIONS_SPEC=
. git-sh-setup
. git-sh-i18n
-set_reflog_action "pull $*"
+if [ $# -gt 0 ]; then
+ set_reflog_action "pull $*"
+else
+ set_reflog_action "pull"
+fi
require_work_tree
cd_to_toplevel
--
1.7.4.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] pull: remove extra space from reflog message
2011-07-20 21:19 Ori Avtalion
@ 2011-07-20 22:22 ` Andreas Schwab
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Schwab @ 2011-07-20 22:22 UTC (permalink / raw)
To: Ori Avtalion; +Cc: git
Ori Avtalion <ori@avtalion.name> writes:
> -set_reflog_action "pull $*"
> +if [ $# -gt 0 ]; then
> + set_reflog_action "pull $*"
> +else
> + set_reflog_action "pull"
> +fi
Or more tersely:
set_reflog_action "pull${1+ $*}"
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-08-01 23:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-29 7:19 [PATCH] pull: remove extra space from reflog message Ori Avtalion
2011-08-01 23:04 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2011-07-20 21:19 Ori Avtalion
2011-07-20 22:22 ` Andreas Schwab
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).