Re: [ANNOUNCE] git-pasky-0.3

[Martin Schlemmer <azarah@nosferatu.za.org>]

[-- Attachment #1.1: Type: text/plain, Size: 438 bytes --]

On Mon, 2005-04-11 at 15:57 +0200, Petr Baudis wrote:
>   Hello,
> 
>   here goes git-pasky-0.3, my set of patches and scripts upon
> Linus' git, aimed at human usability and to an extent a SCM-like usage.
> 

Its pretty dependant on where VERSION is located.  This patch fixes
that. (PS, I left the output of 'git diff' as is to ask about the
following stuff after the proper diff ...)


Regards,

-- 
Martin Schlemmer


[-- Attachment #1.2: add_version.patch --]
[-- Type: text/x-patch, Size: 3297 bytes --]

--- -	2005-04-12 14:36:44.384822000 +0200
+++ Makefile	2005-04-12 14:33:14.000000000 +0200
@@ -19,10 +19,14 @@
 	gitcommit.sh gitdiff-do gitdiff.sh gitlog.sh gitls.sh gitlsobj.sh \
 	gitmerge.sh gitpull.sh gitrm.sh gittag.sh gittrack.sh
 
-all: $(PROG)
+GEN_SCRIPT= gitversion.sh
 
-install: $(PROG)
-	install $(PROG) $(SCRIPT) $(HOME)/bin/
+VERSION= VERSION
+
+all: $(PROG) $(GEN_SCRIPT)
+
+install: $(PROG) $(GEN_SCRIPT)
+	install $(PROG) $(SCRIPT) $(GEN_SCRIPT) $(HOME)/bin/
 
 LIBS= -lssl -lz
 
@@ -67,8 +71,14 @@
 read-cache.o: cache.h
 show-diff.o: cache.h
 
+gitversion.sh: $(VERSION)
+	@rm -f $@
+	@echo "#!/bin/sh" > $@
+	@echo "echo \"$(shell cat $(VERSION))\"" >> $@
+	@chmod +x $@
+
 clean:
-	rm -f *.o $(PROG) temp_git_file_*
+	rm -f *.o $(PROG) temp_git_file_* $(GEN_SCRIPT)
 
 backup: clean
 	cd .. ; tar czvf dircache.tar.gz dir-cache
--- -	2005-04-12 14:36:44.417284000 +0200
+++ git	2005-04-12 14:31:38.000000000 +0200
@@ -20,7 +20,7 @@
 
 help () {
 	cat <<__END__
-The GIT scripted toolkit  $(cat VERSION)
+The GIT scripted toolkit  $(gitversion.sh)
 
 Usage: git COMMAND [ARG]...
 
COPYING:  fe2a4177a760fd110e78788734f167bd633be8de 33
Makefile:  b514dc5cc62bc9d2b2cf0f81dcce15ff7de83eee 33
README:  fa9b676d62f8ac5c1ff36e7742dc6db8f6cdf97f 33
VERSION:  d71f8ea875f9fbd86de7b1457924492473cd1718 33
cache.h:  d3e9a21b7d9a2ac32abacf5cc40ee1a4d83f9fe8 33
cat-file.c:  45be1badaa8517d4e3a69e0bf1cac2e90191e475 37
checkout-cache.c:  a87b31e3787c312364d7295b782d6c22d1577f5c 33
commit-id:  65c81756c8f10d513d073ecbd741a3244663c4c9 3b
commit-tree.c:  2e25f72ddb66bd8ebd448405f6df76e15cc9d030 33
diff-tree.c:  317339fc9c1169b886fdfc22863e9451109b88c7 33
fsck-cache.c:  7a2f36aa0bc8677adfbc8542338e16d5188dee4a 33
git:  2f1cc7f80079b9c2feec8e7310d30e57b6e4b2aa 33
gitXnormid.sh:  619a89875c4ccd6f380c4be33274a71bb2a1b7f2 33
gitadd.sh:  3ed93ea0fcb995673ba9ee1982e0e7abdbe35982 33
gitaddremote.sh:  ab075628b0b4b16aa05382955b8607700f96101f 33
gitcommit.sh:  5e98e3b5fe501a196a1030c11d1ad6ac87532e6a 33
gitdiff-do:  d6174abceab34d22010c36a8453a6c3f3f184fe0 33
gitdiff.sh:  9f558422003160f0d006f7948702e22d5c90254c 33
gitlog.sh:  d6b33fb0c47369be7b6af3b21f2188e226bf2feb 33
gitls.sh:  b6f15d82f16c1e9982c5031f3be22eb5430273af 33
gitlsobj.sh:  128461d3de6a42cfaaa989fc6401bebdfa885b3f 33
gitmerge.sh:  e25d42dde7c9b929476b0967b2a60d9b342b2e79 3b
gitpull.sh:  f29bb37c5eef416ed65e46aa3c52493d07619cd8 33
gitrm.sh:  5c18c38a890c9fd9ad2b866ee7b529539d2f3f8f 33
gittag.sh:  0cd3188a442a367db327f70aba14ff2a0d69e927 3b
gittrack.sh:  ae34f5c5e1e9969619dde8d0621fd9c212208694 33
init-db.c:  3296763cdb4bd242a9ec01933ac8d3d5320d20e4 33
ls-tree.c:  3e2a6c7d183a42e41f1073dfec6794e8f8a5e75c 37
parent-id:  1801c6fe426592832e7250f8b760fb9d2e65220f 33
read-cache.c:  95d0ec6e95ab054da4ef9673641c9f809eebef2b 33
read-tree.c:  eb548148aa6d212f05c2c622ffbe62a06cd072f9 33
rev-tree.c:  7429b9c4d0aab2e4a494eb4b65129a59da138106 33
show-diff.c:  043772cb08b6795008474316f38a326c4196edd6 37
show-files.c:  347894d6360e5ef56140a9a70d2a0b000a268a33 33
tree-id:  cb70e2c508a18107abe305633612ed702aa3ee4f 37
update-cache.c:  3d49a1cbd20c7fcf1010b0f3affaf896310c6797 33
write-tree.c:  eed7c02123c6c6458597726ef4f8b2208aefa5bb 33

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]