Merge branch 'js/diffstat'
* js/diffstat:
diff --stat: no need to ask funcnames nor context.
diff-options: add --stat (take 2)
diff-options: add --stat (take 2)
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index e995d1b..76cb894 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -12,11 +12,16 @@
DESCRIPTION
-----------
-Shows the commit logs. This command internally invokes
-'git-rev-list', and the command line options are passed to that
-command.
+Shows the commit logs.
-This manual page describes only the most frequently used options.
+The command takes options applicable to the gitlink::git-rev-list[1]
+command to control what is shown and how, and options applicable to
+the gitlink::git-diff-tree[1] commands to control how the change
+each commit introduces are shown.
+
+This manual page describes only the most frequently used
+options.
+
OPTIONS
-------
@@ -29,6 +34,12 @@
<since>..<until>::
Show only commits between the named two commits.
+-p::
+ Show the change the commit introduces in a patch form.
+
+<paths>...::
+ Show only commits that affect the specified paths.
+
Examples
--------
@@ -47,6 +58,11 @@
The "--" is necessary to avoid confusion with the *branch* named
'gitk'
+git log -r --name-status release..test::
+
+ Show the commits that are in the "test" branch but not yet
+ in the "release" branch, along with the list of paths
+ each commit modifies.
Author
------
diff --git a/commit.c b/commit.c
index c7bb8db..ca25574 100644
--- a/commit.c
+++ b/commit.c
@@ -557,16 +557,11 @@
if (fmt == CMIT_FMT_ONELINE)
break;
}
- if (fmt == CMIT_FMT_ONELINE) {
- /* We do not want the terminating newline */
- if (buf[offset - 1] == '\n')
- offset--;
- }
- else {
- /* Make sure there is an EOLN */
- if (buf[offset - 1] != '\n')
- buf[offset++] = '\n';
- }
+ while (offset && isspace(buf[offset-1]))
+ offset--;
+ /* Make sure there is an EOLN for the non-oneline case */
+ if (fmt != CMIT_FMT_ONELINE)
+ buf[offset++] = '\n';
buf[offset] = '\0';
return offset;
}
diff --git a/git-fetch.sh b/git-fetch.sh
index 711650f..83143f8 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -252,10 +252,10 @@
else
not_for_merge=
fi
- if expr "z$ref" : 'z\+' >/dev/null
+ if expr "z$ref" : 'z+' >/dev/null
then
single_force=t
- ref=$(expr "z$ref" : 'z\+\(.*\)')
+ ref=$(expr "z$ref" : 'z+\(.*\)')
else
single_force=
fi
diff --git a/git-log.sh b/git-log.sh
deleted file mode 100755
index c2ea71c..0000000
--- a/git-log.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005 Linus Torvalds
-#
-
-USAGE='[--max-count=<n>] [<since>..<limit>] [--pretty=<format>] [git-rev-list options]'
-SUBDIRECTORY_OK='Yes'
-. git-sh-setup
-
-revs=$(git-rev-parse --revs-only --no-flags --default HEAD "$@") || exit
-[ "$revs" ] || {
- die "No HEAD ref"
-}
-git-rev-list --pretty $(git-rev-parse --default HEAD "$@") |
-LESS=-S ${PAGER:-less}
diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 65c66d5..c9b899e 100755
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -77,7 +77,7 @@
force=
case "$ref" in
+*)
- ref=$(expr "z$ref" : 'z\+\(.*\)')
+ ref=$(expr "z$ref" : 'z+\(.*\)')
force=+
;;
esac
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 025ef2d..d15747f 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -30,7 +30,7 @@
fi
case "$1" in
- --h|--he|--hel|--help)
+ -h|--h|--he|--hel|--help)
echo "$LONG_USAGE"
exit
esac
diff --git a/stripspace.c b/stripspace.c
index dee1ef0..65a6346 100644
--- a/stripspace.c
+++ b/stripspace.c
@@ -12,7 +12,9 @@
{
int len = strlen(line);
- if (len > 1 && line[len-1] == '\n') {
+ if (len && line[len-1] == '\n') {
+ if (len == 1)
+ return 0;
do {
unsigned char c = line[len-2];
if (!isspace(c))
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index e15e14f..92f12d9 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -12,11 +12,6 @@
# Some convenience functions
-function show_count () {
- commit_count=$(($commit_count+1))
- printf " %d\r" $commit_count
-}
-
function add () {
local name=$1
local text="$@"
@@ -55,13 +50,6 @@
"test $count = $output"
}
-function test_repack () {
- local rep=$1
-
- test_expect_success "repack && prune-packed in $rep" \
- '(git-repack && git-prune-packed)2>>log.txt'
-}
-
function pull_to_client () {
local number=$1
local heads=$2
@@ -70,13 +58,23 @@
cd client
test_expect_success "$number pull" \
- "git-fetch-pack -v .. $heads > log.txt 2>&1"
+ "git-fetch-pack -k -v .. $heads"
case "$heads" in *A*) echo $ATIP > .git/refs/heads/A;; esac
case "$heads" in *B*) echo $BTIP > .git/refs/heads/B;; esac
git-symbolic-ref HEAD refs/heads/${heads:0:1}
+
test_expect_success "fsck" 'git-fsck-objects --full > fsck.txt 2>&1'
- test_expect_object_count "after $number pull" $count
- pack_count=$(grep Unpacking log.txt|tr -dc "0-9")
+
+ test_expect_success 'check downloaded results' \
+ 'mv .git/objects/pack/pack-* . &&
+ p=`ls -1 pack-*.pack` &&
+ git-unpack-objects <$p &&
+ git-fsck-objects --full'
+
+ test_expect_success "new object count after $number pull" \
+ 'idx=`echo pack-*.idx` &&
+ pack_count=`git-show-index <$idx | wc -l` &&
+ test $pack_count = $count'
test -z "$pack_count" && pack_count=0
if [ -z "$no_strict_count_check" ]; then
test_expect_success "minimal count" "test $count = $pack_count"
@@ -84,6 +82,7 @@
test $count != $pack_count && \
echo "WARNING: $pack_count objects transmitted, only $count of which were needed"
fi
+ rm -f pack-*
cd ..
}
@@ -117,8 +116,6 @@
pull_to_client 1st "B A" $((11*3))
-(cd client; test_repack client)
-
add A11 $A10
prev=1; cur=2; while [ $cur -le 65 ]; do
@@ -129,8 +126,6 @@
pull_to_client 2nd "B" $((64*3))
-(cd client; test_repack client)
-
pull_to_client 3rd "A" $((1*3)) # old fails
test_done
