From: Junio C Hamano <junkio@cox.net>
Date: Fri, 23 Dec 2005 02:19:03 +0000 (-0800)
Subject: Merge in fixes up to 1.0.3 maintenance branch.
X-Git-Tag: v1.1.0~32
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c10d63451883f67c37622d2a21b2fc93be2f90c9?ds=inline;hp=-c

Merge in fixes up to 1.0.3 maintenance branch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

c10d63451883f67c37622d2a21b2fc93be2f90c9
diff --combined Makefile
index 88b89f956f,890f16bdad..3395a9e102
--- a/Makefile
+++ b/Makefile
@@@ -55,7 -55,7 +55,7 @@@ all
  # Define USE_STDEV below if you want git to care about the underlying device
  # change being considered an inode change from the update-cache perspective.
  
 -GIT_VERSION = 1.0.3
 +GIT_VERSION = 1.0.GIT
  
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
@@@ -397,6 -397,9 +397,9 @@@ $(patsubst %.py,%,$(SCRIPT_PYTHON)) : 
  git-cherry-pick: git-revert
  	cp $< $@
  
+ # format-patch records GIT_VERSION
+ git-format-patch: Makefile
+ 
  %.o: %.c
  	$(CC) -o $*.o -c $(ALL_CFLAGS) $<
  %.o: %.S
diff --combined debian/changelog
index 084e37a37a,53af1d64c3..8d6c0667c7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,26 +1,38 @@@
 +git-core (1.0.GIT-0) unstable; urgency=low
 +
 +  * Post GIT 1.0 development track.
 +
 + -- Junio C Hamano <junkio@cox.net>  Wed, 21 Dec 2005 22:28:33 -0800
 +
 +git-core (1.0.0.GIT-0) unstable; urgency=low
 +
 +  * Post GIT 1.0.0 development track.
 +
 + -- Junio C Hamano <junkio@cox.net>  Wed, 21 Dec 2005 12:12:05 -0800
 +
+ git-core (1.0.3-0) unstable; urgency=low
+ 
+   * GIT 1.0.3 maintenance release.
+ 
+  -- Junio C Hamano <junkio@cox.net>  Thu, 22 Dec 2005 18:13:33 -0800
+ 
+ git-core (1.0.0b-0) unstable; urgency=low
+ 
+   * GIT 1.0.0b to include two more fixes.
+ 
+  -- Junio C Hamano <junkio@cox.net>  Wed, 21 Dec 2005 13:50:21 -0800
+ 
+ git-core (1.0.0a-0) unstable; urgency=low
+ 
+   * GIT 1.0.0a to include the following fixes:
+   
+     - Avoid misleading success message on error (Johannes)
+     - objects/info/packs: work around bug in http-fetch.c::fetch_indices()
+     - http-fetch.c: fix objects/info/pack parsing.
+     - An off-by-one bug found by valgrind (Pavel)
+ 
+  -- Junio C Hamano <junkio@cox.net>  Wed, 21 Dec 2005 13:17:17 -0800
+ 
  git-core (1.0.0-0) unstable; urgency=low
  
    * GIT 1.0.0