{"thread":{"id":"100","subject":"[pasky] recent changes to gitdiff.sh","startedAt":"2005-04-18T10:40:08Z","lastAt":"2005-04-18T10:57:26Z","messageCount":3,"participants":["Martin Schlemmer","Petr Baudis"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"642","messageId":"1113820808.16288.9.camel@nosferatu.lan","threadId":"100","inReplyTo":null,"subject":"[pasky] recent changes to gitdiff.sh","fromName":"Martin Schlemmer","fromEmail":"azarah@nosferatu.za.org","sentAt":"2005-04-18T10:40:08Z","receivedAt":"2005-04-18T10:40:08Z","isPatch":false,"sender":{"key":"azarah@nosferatu.za.org","avatar":null},"body":"Hi,\n\nI see the recent changes to gitdiff.sh requires you to pass -r (git diff\n-r local:$tracking) even if you separate the branches via ':'. Is this\nintended (seems like it)? If so, then gittrack.sh, gitpull.sh and\ngitmerge.sh needs to be updated ...\n\n(I did not want to add a patch as I am not sure which it is)\n\n\nThanks,\n\n-- \nMartin Schlemmer\n\n"},{"id":"643","messageId":"20050418104038.GM1461@pasky.ji.cz","threadId":"100","inReplyTo":"1113820808.16288.9.camel@nosferatu.lan","subject":"Re: [pasky] recent changes to gitdiff.sh","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-04-18T10:40:38Z","receivedAt":"2005-04-18T10:40:38Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Mon, Apr 18, 2005 at 12:40:08PM CEST, I got a letter\nwhere Martin Schlemmer told me that...\n> Hi,\n\nHello,\n\n> I see the recent changes to gitdiff.sh requires you to pass -r (git diff\n> -r local:$tracking) even if you separate the branches via ':'. Is this\n> intended (seems like it)?\n\nyes. This brings the usage style in sync with the rest of the world. :-)\n\n> If so, then gittrack.sh, gitpull.sh and gitmerge.sh needs to be\n> updated ...\n\nI hopes I updated all the places. If I missed anything, please say what.\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nC++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor\n"},{"id":"645","messageId":"1113821846.16288.15.camel@nosferatu.lan","threadId":"100","inReplyTo":"20050418104038.GM1461@pasky.ji.cz","subject":"Re: [pasky] recent changes to gitdiff.sh","fromName":"Martin Schlemmer","fromEmail":"azarah@nosferatu.za.org","sentAt":"2005-04-18T10:57:26Z","receivedAt":"2005-04-18T10:57:26Z","isPatch":false,"sender":{"key":"azarah@nosferatu.za.org","avatar":null},"body":"On Mon, 2005-04-18 at 12:40 +0200, Petr Baudis wrote:\n> Dear diary, on Mon, Apr 18, 2005 at 12:40:08PM CEST, I got a letter\n> where Martin Schlemmer told me that...\n> > Hi,\n> \n> Hello,\n> \n> > I see the recent changes to gitdiff.sh requires you to pass -r (git diff\n> > -r local:$tracking) even if you separate the branches via ':'. Is this\n> > intended (seems like it)?\n> \n> yes. This brings the usage style in sync with the rest of the world. :-)\n> \n> > If so, then gittrack.sh, gitpull.sh and gitmerge.sh needs to be\n> > updated ...\n> \n> I hopes I updated all the places. If I missed anything, please say what.\n> \n\nUpdate calls to gitdiff.sh to include the '-r' switch.\n\nSigned-off-by: Martin Schlemmer \n\ngitmerge.sh: 7ea441e584d603463fb1b83991b88f63a3895cff\n--- 1/gitmerge.sh\n+++ 2/gitmerge.sh 2005-04-18 12:55:34.000000000 +0200\n@@ -67,7 +67,7 @@\n fi\n update-cache --refresh\n\n-gitdiff.sh \"$base\":\"$branch\" | gitapply.sh\n+gitdiff.sh -r \"$base\":\"$branch\" | gitapply.sh\n\n cat >&2 <<__END__\n Please inspect the merge in the ,,merge/ subdirectory. Commit from that\ngitpull.sh: 9bda6555a1dafc1db762bc46db60d2a9485dc523\n--- 1/gitpull.sh\n+++ 2/gitpull.sh 2005-04-18 12:55:34.000000000 +0200\n@@ -73,7 +73,7 @@\n gitmerge.sh -b \"$orig_head\" \"$new_head\"\n\n else\n- gitdiff.sh \"$orig_head\":\"$new_head\" | gitapply.sh\n+ gitdiff.sh -r \"$orig_head\":\"$new_head\" | gitapply.sh\n read-tree $(tree-id $new_head)\n\n echo $new_head >.git/HEAD\ngittrack.sh: 30654380c10edde32def8e5fa2e2c956fbff3d58\n--- 1/gittrack.sh\n+++ 2/gittrack.sh 2005-04-18 12:55:34.000000000 +0200\n@@ -50,7 +50,7 @@\n echo $name >.git/tracking\n\n read-tree $(tree-id \"$name\")\n- gitdiff.sh local:\"$name\" | gitapply.sh\n+ gitdiff.sh -r local:\"$name\" | gitapply.sh\n update-cache --refresh\n\n else\n@@ -60,7 +60,7 @@\n die \"tracked \\\"$tracking\\\" branch missing!\"\n\n if [ -s \".git/HEAD.local\" ]; then\n- gitdiff.sh \"$tracking\":local | gitapply.sh\n+ gitdiff.sh -r \"$tracking\":local | gitapply.sh\n read-tree $(tree-id local)\n update-cache --refresh\n\n\n\n-- \nMartin Schlemmer\n\n\n\ngitmerge.sh: 7ea441e584d603463fb1b83991b88f63a3895cff\n--- 1/gitmerge.sh\n+++ 2/gitmerge.sh\t2005-04-18 12:55:34.000000000 +0200\n@@ -67,7 +67,7 @@\n fi\n update-cache --refresh\n \n-gitdiff.sh \"$base\":\"$branch\" | gitapply.sh\n+gitdiff.sh -r \"$base\":\"$branch\" | gitapply.sh\n \n cat >&2 <<__END__\n Please inspect the merge in the ,,merge/ subdirectory. Commit from that\ngitpull.sh: 9bda6555a1dafc1db762bc46db60d2a9485dc523\n--- 1/gitpull.sh\n+++ 2/gitpull.sh\t2005-04-18 12:55:34.000000000 +0200\n@@ -73,7 +73,7 @@\n \t\tgitmerge.sh -b \"$orig_head\" \"$new_head\"\n \n \telse\n-\t\tgitdiff.sh \"$orig_head\":\"$new_head\" | gitapply.sh\n+\t\tgitdiff.sh -r \"$orig_head\":\"$new_head\" | gitapply.sh\n \t\tread-tree $(tree-id $new_head)\n \n \t\techo $new_head >.git/HEAD\ngittrack.sh: 30654380c10edde32def8e5fa2e2c956fbff3d58\n--- 1/gittrack.sh\n+++ 2/gittrack.sh\t2005-04-18 12:55:34.000000000 +0200\n@@ -50,7 +50,7 @@\n \techo $name >.git/tracking\n \n \tread-tree $(tree-id \"$name\")\n-\tgitdiff.sh local:\"$name\" | gitapply.sh\n+\tgitdiff.sh -r local:\"$name\" | gitapply.sh\n \tupdate-cache --refresh\n \n else\n@@ -60,7 +60,7 @@\n \t\tdie \"tracked \\\"$tracking\\\" branch missing!\"\n \n \tif [ -s \".git/HEAD.local\" ]; then\n-\t\tgitdiff.sh \"$tracking\":local | gitapply.sh\n+\t\tgitdiff.sh -r \"$tracking\":local | gitapply.sh\n \t\tread-tree $(tree-id local)\n \t\tupdate-cache --refresh\n \n"}]}