Skip to content

Instantly share code, notes, and snippets.

@hellertime

hellertime/gist:a0c3f86aa70deaea694e

Last active August 29, 2015 14:24
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save hellertime/a0c3f86aa70deaea694e to your computer and use it in GitHub Desktop.
Save hellertime/a0c3f86aa70deaea694e to your computer and use it in GitHub Desktop.
Download ZIP
#git index corruption?
Raw
gistfile1.txt
$ git status -s
warning: skipping rename detection, detected duplicate destination 'src/main/java/com/a/r/s2s/eventbus/EventBus.java'
D src/main
D src/main/java/com/a/r/s2s/Flags.java
A src/main/java/com/a/r/s2s/Main.java
A src/main/java/com/a/r/s2s/Stream2StoreConfig.java
D src/main/java/com/a/r/s2s/Stream2StoreCycler.java
D src/main/java/com/a/r/s2s/Stream2StoreEvent.java
D src/main/java/com/a/r/s2s/Stream2StoreExecutor.java
A src/main/java/com/a/r/s2s/Stream2StoreScheduler.java
D src/main/java/com/a/r/s2s/Stream2StoreSchedulerDriver.java
A src/main/java/com/a/r/s2s/cassandra/CassandraColumn.java
D src/main/java/com/a/r/s2s/cycler/Stream2EphemeralCycler.java
M src/main/java/com/a/r/s2s/eventbus/EventBus.java
M src/main/java/com/a/r/s2s/io/eaconEphemeralWriter.java
M src/main/java/com/a/r/s2s/kafka/KafkaBroker.java
M src/main/java/com/a/r/s2s/tasks/Cycler.java
?? conf/
?? target/
$ git reset
Unstaged changes after reset:
T src/main
M src/main/java/com/a/r/s2s/io/BeaconEphemeralWriter.java
M src/main/java/com/a/r/s2s/kafka/KafkaBroker.java
M src/main/java/com/a/r/s2s/tasks/Cycler.java
git status -s
D src/main
D src/main/java/com/a/r/s2s/Flags.java
D src/main/java/com/a/r/s2s/Main.java
D src/main/java/com/a/r/s2s/Stream2StoreConfig.java
D src/main/java/com/a/r/s2s/Stream2StoreCycler.java
D src/main/java/com/a/r/s2s/Stream2StoreEvent.java
D src/main/java/com/a/r/s2s/Stream2StoreExecutor.java
D src/main/java/com/a/r/s2s/Stream2StoreScheduler.java
D src/main/java/com/a/r/s2s/Stream2StoreSchedulerDriver.java
D src/main/java/com/a/r/s2s/cassandra/CassandraColumn.java
D src/main/java/com/a/r/s2s/cycler/Stream2EphemeralCycler.java
M src/main/java/com/a/r/s2s/eventbus/EventBus.java
M src/main/java/com/a/r/s2s/io/BeaconEphemeralWriter.java
M src/main/java/com/a/r/s2s/kafka/KafkaBroker.java
M src/main/java/com/a/r/s2s/tasks/Cycler.java
?? conf/
?? src/main/java/com/a/r/s2s/Flags.java
?? src/main/java/com/a/r/s2s/Main.java
?? src/main/java/com/a/r/s2s/Stream2StoreConfig.java
?? src/main/java/com/a/r/s2s/Stream2StoreCycler.java
?? src/main/java/com/a/r/s2s/Stream2StoreEvent.java
?? src/main/java/com/a/r/s2s/Stream2StoreExecutor.java
?? src/main/java/com/a/r/s2s/Stream2StoreScheduler.java
?? src/main/java/com/a/r/s2s/Stream2StoreSchedulerDriver.java
?? src/main/java/com/a/r/s2s/cassandra/
?? src/main/java/com/a/r/s2s/cycler/
?? src/main/java/com/a/r/s2s/eventbus/
?? target/
$ git ls-files -d
$ git commit -m "Try to commit"
You have both src/main and src/main/java/com/a/r/s2s/io/BeaconEphemeralWriter.java
You have both src/main and src/main/java/com/a/r/s2s/io/BeaconEphemeralWriter.java
error: Error building trees
$ git add src/main -u
$ git status -s
D src/main
D src/main/java/com/a/r/s2s/Flags.java
D src/main/java/com/a/r/s2s/Main.java
D src/main/java/com/a/r/s2s/Stream2StoreConfig.java
D src/main/java/com/a/r/s2s/Stream2StoreCycler.java
D src/main/java/com/a/r/s2s/Stream2StoreEvent.java
D src/main/java/com/a/r/s2s/Stream2StoreExecutor.java
D src/main/java/com/a/r/s2s/Stream2StoreScheduler.java
D src/main/java/com/a/r/s2s/Stream2StoreSchedulerDriver.java
D src/main/java/com/a/r/s2s/cassandra/CassandraColumn.java
D src/main/java/com/a/r/s2s/cycler/Stream2EphemeralCycler.java
M src/main/java/com/a/r/s2s/eventbus/EventBus.java
M src/main/java/com/a/r/s2s/io/BeaconEphemeralWriter.java
M src/main/java/com/a/r/s2s/kafka/KafkaBroker.java
M src/main/java/com/a/r/s2s/tasks/Cycler.java
?? conf/
?? src/main/java/com/a/r/s2s/Flags.java
?? src/main/java/com/a/r/s2s/Main.java
?? src/main/java/com/a/r/s2s/Stream2StoreConfig.java
?? src/main/java/com/a/r/s2s/Stream2StoreCycler.java
?? src/main/java/com/a/r/s2s/Stream2StoreEvent.java
?? src/main/java/com/a/r/s2s/Stream2StoreExecutor.java
?? src/main/java/com/a/r/s2s/Stream2StoreScheduler.java
?? src/main/java/com/a/r/s2s/Stream2StoreSchedulerDriver.java
?? src/main/java/com/a/r/s2s/cassandra/
?? src/main/java/com/a/r/s2s/cycler/
?? src/main/java/com/a/r/s2s/eventbus/
?? target/
$ git add src/main
$ git status -s
warning: skipping rename detection, detected duplicate destination 'src/main/java/com/a/r/s2s/eventbus/EventBus.java'
D src/main
D src/main/java/com/a/r/s2s/Flags.java
A src/main/java/com/a/r/s2s/Main.java
A src/main/java/com/a/r/s2s/Stream2StoreConfig.java
D src/main/java/com/a/r/s2s/Stream2StoreCycler.java
D src/main/java/com/a/r/s2s/Stream2StoreEvent.java
D src/main/java/com/a/r/s2s/Stream2StoreExecutor.java
A src/main/java/com/a/r/s2s/Stream2StoreScheduler.java
D src/main/java/com/a/r/s2s/Stream2StoreSchedulerDriver.java
A src/main/java/com/a/r/s2s/cassandra/CassandraColumn.java
D src/main/java/com/a/r/s2s/cycler/Stream2EphemeralCycler.java
M src/main/java/com/a/r/s2s/eventbus/EventBus.java
M src/main/java/com/a/r/s2s/io/BeaconEphemeralWriter.java
M src/main/java/com/a/r/s2s/kafka/KafkaBroker.java
M src/main/java/com/a/r/s2s/tasks/Cycler.java
?? conf/
?? target/
$ git commit -m "Try another commit"
You have both src/main and src/main/java/com/a/r/s2s/Flags.java
You have both src/main and src/main/java/com/a/r/s2s/Flags.java
error: Error building trees
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment