* Re: [pasky] recent changes to gitdiff.sh
2005-04-18 10:40 ` Petr Baudis
@ 2005-04-18 10:57 ` Martin Schlemmer
0 siblings, 0 replies; 3+ messages in thread
From: Martin Schlemmer @ 2005-04-18 10:57 UTC (permalink / raw)
To: Petr Baudis; +Cc: GIT Mailing Lists
[-- Attachment #1.1: Type: text/plain, Size: 2344 bytes --]
On Mon, 2005-04-18 at 12:40 +0200, Petr Baudis wrote:
> Dear diary, on Mon, Apr 18, 2005 at 12:40:08PM CEST, I got a letter
> where Martin Schlemmer <azarah@nosferatu.za.org> told me that...
> > Hi,
>
> Hello,
>
> > I see the recent changes to gitdiff.sh requires you to pass -r (git diff
> > -r local:$tracking) even if you separate the branches via ':'. Is this
> > intended (seems like it)?
>
> yes. This brings the usage style in sync with the rest of the world. :-)
>
> > If so, then gittrack.sh, gitpull.sh and gitmerge.sh needs to be
> > updated ...
>
> I hopes I updated all the places. If I missed anything, please say what.
>
Update calls to gitdiff.sh to include the '-r' switch.
Signed-off-by: Martin Schlemmer <azarah@nosferatu.za.org>
gitmerge.sh: 7ea441e584d603463fb1b83991b88f63a3895cff
--- 1/gitmerge.sh
+++ 2/gitmerge.sh 2005-04-18 12:55:34.000000000 +0200
@@ -67,7 +67,7 @@
fi
update-cache --refresh
-gitdiff.sh "$base":"$branch" | gitapply.sh
+gitdiff.sh -r "$base":"$branch" | gitapply.sh
cat >&2 <<__END__
Please inspect the merge in the ,,merge/ subdirectory. Commit from that
gitpull.sh: 9bda6555a1dafc1db762bc46db60d2a9485dc523
--- 1/gitpull.sh
+++ 2/gitpull.sh 2005-04-18 12:55:34.000000000 +0200
@@ -73,7 +73,7 @@
gitmerge.sh -b "$orig_head" "$new_head"
else
- gitdiff.sh "$orig_head":"$new_head" | gitapply.sh
+ gitdiff.sh -r "$orig_head":"$new_head" | gitapply.sh
read-tree $(tree-id $new_head)
echo $new_head >.git/HEAD
gittrack.sh: 30654380c10edde32def8e5fa2e2c956fbff3d58
--- 1/gittrack.sh
+++ 2/gittrack.sh 2005-04-18 12:55:34.000000000 +0200
@@ -50,7 +50,7 @@
echo $name >.git/tracking
read-tree $(tree-id "$name")
- gitdiff.sh local:"$name" | gitapply.sh
+ gitdiff.sh -r local:"$name" | gitapply.sh
update-cache --refresh
else
@@ -60,7 +60,7 @@
die "tracked \"$tracking\" branch missing!"
if [ -s ".git/HEAD.local" ]; then
- gitdiff.sh "$tracking":local | gitapply.sh
+ gitdiff.sh -r "$tracking":local | gitapply.sh
read-tree $(tree-id local)
update-cache --refresh
--
Martin Schlemmer
[-- Attachment #1.2: git-diff_sh-updates.patch --]
[-- Type: text/x-patch, Size: 1350 bytes --]
gitmerge.sh: 7ea441e584d603463fb1b83991b88f63a3895cff
--- 1/gitmerge.sh
+++ 2/gitmerge.sh 2005-04-18 12:55:34.000000000 +0200
@@ -67,7 +67,7 @@
fi
update-cache --refresh
-gitdiff.sh "$base":"$branch" | gitapply.sh
+gitdiff.sh -r "$base":"$branch" | gitapply.sh
cat >&2 <<__END__
Please inspect the merge in the ,,merge/ subdirectory. Commit from that
gitpull.sh: 9bda6555a1dafc1db762bc46db60d2a9485dc523
--- 1/gitpull.sh
+++ 2/gitpull.sh 2005-04-18 12:55:34.000000000 +0200
@@ -73,7 +73,7 @@
gitmerge.sh -b "$orig_head" "$new_head"
else
- gitdiff.sh "$orig_head":"$new_head" | gitapply.sh
+ gitdiff.sh -r "$orig_head":"$new_head" | gitapply.sh
read-tree $(tree-id $new_head)
echo $new_head >.git/HEAD
gittrack.sh: 30654380c10edde32def8e5fa2e2c956fbff3d58
--- 1/gittrack.sh
+++ 2/gittrack.sh 2005-04-18 12:55:34.000000000 +0200
@@ -50,7 +50,7 @@
echo $name >.git/tracking
read-tree $(tree-id "$name")
- gitdiff.sh local:"$name" | gitapply.sh
+ gitdiff.sh -r local:"$name" | gitapply.sh
update-cache --refresh
else
@@ -60,7 +60,7 @@
die "tracked \"$tracking\" branch missing!"
if [ -s ".git/HEAD.local" ]; then
- gitdiff.sh "$tracking":local | gitapply.sh
+ gitdiff.sh -r "$tracking":local | gitapply.sh
read-tree $(tree-id local)
update-cache --refresh
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread