Skip to content

use --no-ext-diff #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pmolodo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use --no-ext-diff #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions guilt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ commit()
pname="$1"
cd_to_toplevel

git diff-files --name-only | (while read n; do git update-index "$n" ; done)
git diff-files --no-ext-diff --name-only | (while read n; do git update-index "$n" ; done)

# grab a commit message out of the patch
do_get_header "$p" > "$TMP_MSG"
Expand Down Expand Up @@ -715,8 +715,8 @@ push_patch()
must_commit_first()
{
git update-index --refresh --unmerged -q > /dev/null
[ `git diff-files | wc -l` -eq 0 ] || return $?
[ `git diff-index HEAD | wc -l` -eq 0 ]
[ `git diff-files --no-ext-diff | wc -l` -eq 0 ] || return $?
[ `git diff-index --no-ext-diff HEAD | wc -l` -eq 0 ]
return $?
}

Expand Down Expand Up @@ -797,13 +797,13 @@ __refresh_patch()
if [ -n "$5" -o $diffstat = "true" ]; then
(
echo "---"
git diff --stat $diffopts "$2"
git diff --no-ext-diff --stat $diffopts "$2"
echo ""
) >> "$TMP_DIFF"
fi

# get the new patch
git diff --binary $diffopts "$2" >> "$TMP_DIFF"
git diff --no-ext-diff --binary $diffopts "$2" >> "$TMP_DIFF"

# move the new patch in
mv "$p" "$p~"
Expand Down
2 changes: 1 addition & 1 deletion guilt-diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ PREV=HEAD^
[ -z "`get_top`" ] && PREV=
[ ! -z "$working_tree" ] && PREV=

git diff --binary $PREV -- "$@"
git diff --no-ext-diff --binary $PREV -- "$@"

}
4 changes: 2 additions & 2 deletions guilt-files
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ fi | while read patch; do
IFS=' '
(
if [ "$top_patch" != "$patch" ]; then
git diff-tree -r $obj^ $obj
git diff-tree --no-ext-diff -r $obj^ $obj
else
git diff-index HEAD^
git diff-index --no-ext-diff HEAD^
fi
) | tr '\t' ' '|
while read omode nmode osha1 nsha1 st file; do
Expand Down
2 changes: 1 addition & 1 deletion guilt-graph
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ fi

getfiles()
{
git diff-tree -r "$1^" "$1" | cut -f2
git diff-tree --no-ext-diff -r "$1^" "$1" | cut -f2
}

disp "digraph G {"
Expand Down
2 changes: 1 addition & 1 deletion guilt-import-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ for rev in `git rev-list $rhash`; do
(
do_make_header $rev
echo ""
git diff --binary $rev^..$rev
git diff --no-ext-diff --binary $rev^..$rev
) > "$GUILT_DIR/$branch/$fname"

# FIXME: grab the GIT_AUTHOR_DATE from the commit object and set the
Expand Down
2 changes: 1 addition & 1 deletion guilt-new
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ mkdir_dir=`dirname "$GUILT_DIR/$branch/$patch"`
if [ ! -z "$force" ]; then
(
cd_to_toplevel
git diff --binary HEAD >> "$GUILT_DIR/$branch/$patch"
git diff --no-ext-diff --binary HEAD >> "$GUILT_DIR/$branch/$patch"
)
fi

Expand Down
2 changes: 1 addition & 1 deletion guilt-rebase
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ mkdir "$rebase_dir"
# calculate the patch ids for all the commits in upstream
#
for c in $inup ; do
git diff-tree -p $c
git diff-tree --no-ext-diff -p $c
done | git patch-id | while read id name ; do
echo "$name" >> "$rebase_dir/$id"
done
Expand Down
2 changes: 1 addition & 1 deletion guilt-status
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ git rev-parse --verify HEAD >/dev/null 2>&1 || IS_INITIAL=t
# added
if [ -z "$IS_INITIAL" ]; then
# non-initial commit
git diff-index -M --name-status --diff-filter=$DIFF_FILTER HEAD
git diff-index --no-ext-diff -M --name-status --diff-filter=$DIFF_FILTER HEAD
else
# initial commit
git ls-files | sed -e "s/^/A\t/"
Expand Down
20 changes: 10 additions & 10 deletions regression/t-025.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/dir/subdir/file
f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/file
f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/prepend
r acdeef96ee30eb34bbbf65d11de5cf7da4b5fee8 .git/refs/patches/master/prepend
% guilt new cr
% guilt new cr
Patchname is invalid.
It must follow the rules in git-check-ref-format(1).
% list_files
Expand Down Expand Up @@ -809,7 +809,7 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/dir/subdir/file
f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/file
f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/prepend
r acdeef96ee30eb34bbbf65d11de5cf7da4b5fee8 .git/refs/patches/master/prepend
% git diff
% git diff --no-ext-diff
diff --git a/def b/def
index 8baef1b..e0e56d9 100644
--- a/def
Expand All @@ -820,7 +820,7 @@ index 8baef1b..e0e56d9 100644
+qwerty
% guilt new uncommitted-changes
Uncommited changes detected. Refresh first.
% git diff
% git diff --no-ext-diff
diff --git a/def b/def
index 8baef1b..e0e56d9 100644
--- a/def
Expand Down Expand Up @@ -851,7 +851,7 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/file
f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/prepend
r acdeef96ee30eb34bbbf65d11de5cf7da4b5fee8 .git/refs/patches/master/prepend
% guilt new -f uncommitted-changes
% git diff
% git diff --no-ext-diff
% guilt pop
Now at prepend.
% guilt push
Expand Down Expand Up @@ -881,8 +881,8 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/prepend
r acdeef96ee30eb34bbbf65d11de5cf7da4b5fee8 .git/refs/patches/master/prepend
r d82a031e1b47908b850c7a8312300ef5cf289271 .git/refs/patches/master/uncommitted-changes
% git update-index def
% git diff
% git diff HEAD
% git diff --no-ext-diff
% git diff --no-ext-diff HEAD
diff --git a/def b/def
index e0e56d9..2f766df 100644
--- a/def
Expand All @@ -895,8 +895,8 @@ index e0e56d9..2f766df 100644
+dvorak
% guilt new uncommitted-changes2
Uncommited changes detected. Refresh first.
% git diff
% git diff HEAD
% git diff --no-ext-diff
% git diff --no-ext-diff HEAD
diff --git a/def b/def
index e0e56d9..2f766df 100644
--- a/def
Expand Down Expand Up @@ -931,8 +931,8 @@ f da39a3ee5e6b4b0d3255bfef95601890afd80709 .git/patches/master/prepend
r acdeef96ee30eb34bbbf65d11de5cf7da4b5fee8 .git/refs/patches/master/prepend
r d82a031e1b47908b850c7a8312300ef5cf289271 .git/refs/patches/master/uncommitted-changes
% guilt new -f uncommitted-changes2
% git diff
% git diff HEAD
% git diff --no-ext-diff
% git diff --no-ext-diff HEAD
% guilt pop
Now at uncommitted-changes.
% guilt push
Expand Down
18 changes: 9 additions & 9 deletions regression/t-025.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,16 @@ done

# modify the working dir file
cmd echo qwerty >> def
cmd git diff
cmd git diff --no-ext-diff

# try to make a new patch, without -f
shouldfail guilt new uncommitted-changes
cmd git diff
cmd git diff --no-ext-diff
cmd list_files

# give new -f, to force things
cmd guilt new -f uncommitted-changes
cmd git diff
cmd git diff --no-ext-diff
cmd guilt pop
fixup_time_info uncommitted-changes
cmd guilt push
Expand All @@ -83,19 +83,19 @@ cmd list_files
# modify the working dir file (again)
cmd echo dvorak >> def
cmd git update-index def
cmd git diff
cmd git diff HEAD
cmd git diff --no-ext-diff
cmd git diff --no-ext-diff HEAD

# try to make a new patch, without -f
shouldfail guilt new uncommitted-changes2
cmd git diff
cmd git diff HEAD
cmd git diff --no-ext-diff
cmd git diff --no-ext-diff HEAD
cmd list_files

# give new -f, to force things
cmd guilt new -f uncommitted-changes2
cmd git diff
cmd git diff HEAD
cmd git diff --no-ext-diff
cmd git diff --no-ext-diff HEAD
cmd guilt pop
fixup_time_info uncommitted-changes2
cmd guilt push
Expand Down