Comments on: The illustrated guide to recovering lost commits with Git http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/ Rambling about programming and life as a programmer - by Mathieu Martin Fri, 21 Nov 2008 11:01:19 +0000 http://wordpress.org/?v=2.6.2 By: Brian Estes http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-799 Brian Estes Fri, 26 Sep 2008 15:17:31 +0000 http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-799 Ah, you saved me with this post! Thank you so much. Ah, you saved me with this post! Thank you so much.

]]> By: webmat http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-281 webmat Tue, 01 Jul 2008 04:08:14 +0000 http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-281 @Felix It is indeed a very cool trick to see what commits lead to a specific lost commit. Thanks for the tip :-) Unfortunately, as a Mac heretic I don't have a Tk implementation that allows me to interact much with Gitk, as opposed to Linux users. I can copy/paste the SHA ID, click the buttons / select the combo boxes, but I can't right-click anything. Well, I can, but nothing happens ;-) Now if only an approximate equivalent to TextMate could appear on Linux... An example of Felix' trick: <img src="http://programblings.com/wp-content/uploads/2008/06/gitk_with_lost_commits.png" alt="Gitk displaying two lost commits in sequence" /> @Felix
It is indeed a very cool trick to see what commits lead to a specific lost commit. Thanks for the tip :-)

Unfortunately, as a Mac heretic I don’t have a Tk implementation that allows me to interact much with Gitk, as opposed to Linux users. I can copy/paste the SHA ID, click the buttons / select the combo boxes, but I can’t right-click anything. Well, I can, but nothing happens ;-)

Now if only an approximate equivalent to TextMate could appear on Linux…

An example of Felix’ trick:

Gitk displaying two lost commits in sequence

]]> By: Felix Rabe http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-280 Felix Rabe Mon, 30 Jun 2008 19:15:20 +0000 http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-280 Bah, i meant: gitk [--all] <lost_commit_id> Bah, i meant:

gitk [--all] <lost_commit_id>

]]> By: Felix Rabe http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-279 Felix Rabe Mon, 30 Jun 2008 19:14:41 +0000 http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-279 Try this: git-fsck --lost-found gitk [--all] Right-click, "make branch" -> same as git-checkout -b something Try this:

git-fsck –lost-found
gitk [--all]

Right-click, “make branch” -> same as git-checkout -b something

]]> By: webmat http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-277 webmat Sat, 28 Jun 2008 13:08:26 +0000 http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-277 Glad to be of help, Daniel :-) Glad to be of help, Daniel :-)

]]> By: webmat http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-272 webmat Thu, 26 Jun 2008 10:45:50 +0000 http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-272 Mikong: you're right, I'm using 'md' :-) In fact I made an alias md='mkdir'. But I am under OS X, yes. I'll fix the typo... Mikong: you’re right, I’m using ‘md’ :-)

In fact I made an alias md=’mkdir’. But I am under OS X, yes. I’ll fix the typo…

]]> By: mikong http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-271 mikong Thu, 26 Jun 2008 07:52:40 +0000 http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-271 At first I thought you were just using Windows that's why you used 'md recovery' command instead of 'mkdir recovery'. But with the screenshots you're using Mac OS X right? At first I thought you were just using Windows that’s why you used ‘md recovery’ command instead of ‘mkdir recovery’. But with the screenshots you’re using Mac OS X right?

]]> By: Programblings » Blog Archive » Git remote branches http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-258 Programblings » Blog Archive » Git remote branches Mon, 23 Jun 2008 17:16:50 +0000 http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-258 [...] remember, in case of an emergency, you can always refer to my illustrated guide to recovering lost commits with Git [...] [...] remember, in case of an emergency, you can always refer to my illustrated guide to recovering lost commits with Git [...]

]]> By: So Many Fish » Blog Archive » Yikes….dangling commit! http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-257 So Many Fish » Blog Archive » Yikes….dangling commit! Mon, 23 Jun 2008 11:43:42 +0000 http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-257 [...] for all the world like there is no way to get that work back.  But all is not lost!  Between  this great post in Mathieu Martin’s blog and Eric available just when I needed him even though he’s over in [...] [...] for all the world like there is no way to get that work back.  But all is not lost!  Between  this great post in Mathieu Martin’s blog and Eric available just when I needed him even though he’s over in [...]

]]> By: Mc-Kenna.com » Save your bacon with git http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-253 Mc-Kenna.com » Save your bacon with git Fri, 20 Jun 2008 01:22:53 +0000 http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-253 [...] is the same. Git has tonnes of wonderful magic toys, but it seems it also has a little trick for saving the bacon when you accidentally loose something. One to bookmarked for those special [...] [...] is the same. Git has tonnes of wonderful magic toys, but it seems it also has a little trick for saving the bacon when you accidentally loose something. One to bookmarked for those special [...]

]]> By: webmat http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-252 webmat Thu, 12 Jun 2008 10:59:02 +0000 http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-252 @Tim Good catch, I fixed the few occurrences where it was mangled. Wordpress' markup language is playing tricks on us :-) @Rory and Anon: I'll be posting more about Git shortly. I'll revisit both your suggestions while I'm at it. @Tim
Good catch, I fixed the few occurrences where it was mangled. Wordpress’ markup language is playing tricks on us :-)

@Rory and Anon: I’ll be posting more about Git shortly. I’ll revisit both your suggestions while I’m at it.

]]> By: Tim Abell http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-251 Tim Abell Thu, 12 Jun 2008 09:41:16 +0000 http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-251 In "mathieu@ml recovery (master)$ git fsck –lost-found" the "--lost-found" has had the leading double dash mangled. In “mathieu@ml recovery (master)$ git fsck –lost-found” the “–lost-found” has had the leading double dash mangled.

]]> By: Web 2.0 Announcer http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-249 Web 2.0 Announcer Mon, 09 Jun 2008 15:15:07 +0000 http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-249 <strong>The illustrated guide to recovering lost commits with Git...</strong> [...]A walkthrough to recovering from most kinds of bad situations you can get into with Git, the revolutionary version control system. With cameos by ninjas and motocrosses![...]... The illustrated guide to recovering lost commits with Git…

[...]A walkthrough to recovering from most kinds of bad situations you can get into with Git, the revolutionary version control system. With cameos by ninjas and motocrosses![...]…

]]> By: Jean-Francois Couture http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-248 Jean-Francois Couture Mon, 09 Jun 2008 14:27:30 +0000 http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-248 Nice article Mat! One tip I always give to avoid getting in situation like this is to always run git status between commands. It's a nice habit to get into and the output is generally more helpful than the git error/warning message. I checked the docs about the dangling commits. I think if you ran git prune before gc, it would have removed them. git gc runs prune but keeps commits for 30 days. Then it packs the repository, and according to the prune doc, packed commits do not get removed. That's my guess. Nice article Mat!

One tip I always give to avoid getting in situation like this is to always run git status between commands. It’s a nice habit to get into and the output is generally more helpful than the git error/warning message.

I checked the docs about the dangling commits. I think if you ran git prune before gc, it would have removed them. git gc runs prune but keeps commits for 30 days. Then it packs the repository, and according to the prune doc, packed commits do not get removed. That’s my guess.

]]> By: Rory McCann http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-247 Rory McCann Mon, 09 Jun 2008 13:03:57 +0000 http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-247 I think the reason those danglying commits are still there at the end is because git doesn't get rid of random commits. It keeps them around for 30 days AFAIK. More info: http://www.kernel.org/pub/software/scm/git/docs/git-reflog.html I think the reason those danglying commits are still there at the end is because git doesn’t get rid of random commits. It keeps them around for 30 days AFAIK. More info: http://www.kernel.org/pub/software/scm/git/docs/git-reflog.html

]]> By: anonymous http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-246 anonymous Sun, 08 Jun 2008 20:25:34 +0000 http://programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/#comment-246 Also check out "git log -g". Also check out “git log -g”.

]]>