threads / patch / 27866

patchpull: remove extra space from reflog message

Subject: [PATCH] pull: remove extra space from reflog message

## tl;dr

2 messages between Jul 20, 2011 and Jul 20, 2011. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Ori Avtalion· Jul 20, 2011, 21:19 UTC · lore

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(-)

Show changes to git-pull.sh +5 −1

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

Andreas Schwab· Jul 20, 2011, 22:22 UTC · re: Ori Avtalion · lore

Re: [PATCH] pull: remove extra space from reflog message

Ori Avtalion <ori@avtalion.name> writes:

Show 6 quoted lines

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