git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Wong <normalperson@yhbt.net>
To: Junio C Hamano <junkio@cox.net>
Cc: git list <git@vger.kernel.org>
Subject: [PATCH] rev-{list,parse}: optionally allow -<n> as shorthand for --max-count=<n>
Date: Sun, 29 Jan 2006 05:47:20 -0800	[thread overview]
Message-ID: <20060129134720.GB3428@Muzzle> (raw)
In-Reply-To: <20060129134056.GA3428@Muzzle>

I also made this for my own private use, it's on top of the previous
one I made that is POSIX-friendly.  I don't if you or anyone wants
it merged mainline, but I like it :)

This will only be enabled if POSIX_SHMOSIX is defined at compile-time.

Some versions of head(1) and tail(1) allow their line limits to be
parsed this way.  I find --max-count to be a commonly used option,
and also similar in spirit to head/tail, so I decided to make life
easier on my worn out (and lazy :) fingers with this patch.

Signed-off-by: Eric Wong <normalperson@yhbt.net>

---

 Makefile          |    3 +++
 git-compat-util.h |    3 +++
 rev-list.c        |    7 ++++++-
 rev-parse.c       |    4 ++++
 4 files changed, 16 insertions(+), 1 deletions(-)

3b650b00deb7e51e5c9a8bdc4cc1eaaf4fc65029
diff --git a/Makefile b/Makefile
index 2e95353..9ef97ca 100644
--- a/Makefile
+++ b/Makefile
@@ -367,6 +367,9 @@ endif
 ifdef NO_IPV6
 	ALL_CFLAGS += -DNO_IPV6
 endif
+ifdef POSIX_SHMOSIX
+	ALL_CFLAGS += -DPOSIX_SHMOSIX=1
+endif
 ifdef NO_SOCKADDR_STORAGE
 ifdef NO_IPV6
 	ALL_CFLAGS += -Dsockaddr_storage=sockaddr_in
diff --git a/git-compat-util.h b/git-compat-util.h
index f982b8e..46d331d 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -154,4 +154,7 @@ static inline int sane_case(int x, int h
 #ifndef MAXPATHLEN
 #define MAXPATHLEN 256
 #endif
+#ifndef POSIX_SHMOSIX 
+#define POSIX_SHMOSIX 0
+#endif
 #endif
diff --git a/rev-list.c b/rev-list.c
index 33541cc..c85de51 100644
--- a/rev-list.c
+++ b/rev-list.c
@@ -731,7 +731,12 @@ int main(int argc, const char **argv)
 		char *dotdot;
 		struct commit *commit;
 		unsigned char sha1[20];
-
+		
+		/* accept, -<digit>, like some versions of head/tail  */
+		if (POSIX_SHMOSIX && (*arg == '-') && isdigit(arg[1])) {
+			max_count = atoi(arg + 1);
+			continue;
+		}
 		if (!strcmp(arg, "-n")) {
 			if (++i >= argc)
 				die("-n requires an argument");
diff --git a/rev-parse.c b/rev-parse.c
index 3790463..d9b3fa9 100644
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -53,6 +53,10 @@ static int is_rev_argument(const char *a
 	};
 	const char **p = rev_args;
 
+	/* accept, -<digit>, like some versions of head/tail  */
+	if (POSIX_SHMOSIX && (*arg == '-') && isdigit(arg[1]))
+		return 1;
+
 	for (;;) {
 		const char *str = *p++;
 		int len;
-- 
1.1.4.g3b65

  reply	other threads:[~2006-01-29 13:47 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-01-24  7:29 [PATCH] rev-{list,parse}: allow -<n> as shorthand for --max-count=<n> Eric Wong
2006-01-24  8:02 ` Junio C Hamano
2006-01-25  6:33   ` Eric Wong
2006-01-25  9:52     ` Junio C Hamano
2006-01-29 13:40     ` [PATCH] rev-{list,parse}: allow -n<n> " Eric Wong
2006-01-29 13:47       ` Eric Wong [this message]
2006-01-29 20:15         ` [PATCH] rev-{list,parse}: optionally allow -<n> " Junio C Hamano
2006-01-30  0:28           ` [PATCH] rev-{list,parse}: " Eric Wong
2006-01-29 20:15       ` [PATCH] rev-{list,parse}: allow -n<n> " Junio C Hamano
2006-01-30  0:25         ` Eric Wong
2006-01-30  0:26           ` Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060129134720.GB3428@Muzzle \
    --to=normalperson@yhbt.net \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).